| Message ID | 7fb32cd5779c5c0133754194aa6914fa8689853e.1508412016.git.sbrivio@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] geneve: Fix function matching VNI and tunnel ID on big-endian | expand |
On Thu, 19 Oct 2017 13:31:28 +0200 Stefano Brivio <sbrivio@redhat.com> wrote: > On big-endian machines, functions converting between tunnel ID > and VNI use the three LSBs of tunnel ID storage to map VNI. > > The comparison function eq_tun_id_and_vni(), on the other hand, > attempted to map the VNI from the three MSBs. Fix it by using > the same check implemented on LE, which maps VNI from the three > LSBs of tunnel ID. > > Fixes: 2e0b26e10352 ("geneve: Optimize geneve device lookup.") > Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Thanks, Stefano. Reviewed-by: Jakub Sitnicki <jkbs@redhat.com>
From: Stefano Brivio <sbrivio@redhat.com> Date: Thu, 19 Oct 2017 13:31:28 +0200 > On big-endian machines, functions converting between tunnel ID > and VNI use the three LSBs of tunnel ID storage to map VNI. > > The comparison function eq_tun_id_and_vni(), on the other hand, > attempted to map the VNI from the three MSBs. Fix it by using > the same check implemented on LE, which maps VNI from the three > LSBs of tunnel ID. > > Fixes: 2e0b26e10352 ("geneve: Optimize geneve device lookup.") > Signed-off-by: Stefano Brivio <sbrivio@redhat.com> > --- > I guess this should be queued up for -stable, back to 4.10 Applied and queued up for -stable, thanks.
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index f6404074b7b0..ed51018a813e 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -113,13 +113,7 @@ static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni) static bool eq_tun_id_and_vni(u8 *tun_id, u8 *vni) { -#ifdef __BIG_ENDIAN - return (vni[0] == tun_id[2]) && - (vni[1] == tun_id[1]) && - (vni[2] == tun_id[0]); -#else return !memcmp(vni, &tun_id[5], 3); -#endif } static sa_family_t geneve_get_sk_family(struct geneve_sock *gs)
On big-endian machines, functions converting between tunnel ID and VNI use the three LSBs of tunnel ID storage to map VNI. The comparison function eq_tun_id_and_vni(), on the other hand, attempted to map the VNI from the three MSBs. Fix it by using the same check implemented on LE, which maps VNI from the three LSBs of tunnel ID. Fixes: 2e0b26e10352 ("geneve: Optimize geneve device lookup.") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> --- I guess this should be queued up for -stable, back to 4.10 drivers/net/geneve.c | 6 ------ 1 file changed, 6 deletions(-)