diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-03-21 19:34:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-22 14:52:43 -0400 |
| commit | 1574639411b3ce311b846cae7fda56bf1af7d027 (patch) | |
| tree | 2817a1b1cd4ad4f2bdafb9c7bf2c10875a0d483f /net/ipv4/ip_gre.c | |
| parent | faf4db008163607e993279b7f7aa456cb4c11e9a (diff) | |
| download | linux-stable-1574639411b3ce311b846cae7fda56bf1af7d027.tar.gz linux-stable-1574639411b3ce311b846cae7fda56bf1af7d027.tar.bz2 linux-stable-1574639411b3ce311b846cae7fda56bf1af7d027.zip | |
gre: fix TUNNEL_SEQ bit check on sequence numbering
The current logic of flags | TUNNEL_SEQ is always non-zero and hence
sequence numbers are always incremented no matter the setting of the
TUNNEL_SEQ bit. Fix this by using & instead of |.
Detected by CoverityScan, CID#1466039 ("Operands don't affect result")
Fixes: 77a5196a804e ("gre: add sequence number for collect md mode.")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2fa2ef2e2af9..9ab1aa2f7660 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -550,7 +550,7 @@ static void gre_fb_xmit(struct sk_buff *skb, struct net_device *dev, (TUNNEL_CSUM | TUNNEL_KEY | TUNNEL_SEQ); gre_build_header(skb, tunnel_hlen, flags, proto, tunnel_id_to_key32(tun_info->key.tun_id), - (flags | TUNNEL_SEQ) ? htonl(tunnel->o_seqno++) : 0); + (flags & TUNNEL_SEQ) ? htonl(tunnel->o_seqno++) : 0); df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; |