aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/seg6_iptunnel.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-07-17 16:52:54 +0100
committerDavid S. Miller <davem@davemloft.net>2018-07-18 15:10:47 -0700
commit3ee593adbbb46d9e1bb1320915943926f4744483 (patch)
tree8c13bb5797268e4fadaa6bd12a2b9fa96be99aa5 /net/ipv6/seg6_iptunnel.c
parentMerge tag 'batadv-net-for-davem-20180717' of git://git.open-mesh.org/linux-merge (diff)
downloadlinux-dev-3ee593adbbb46d9e1bb1320915943926f4744483.tar.xz
linux-dev-3ee593adbbb46d9e1bb1320915943926f4744483.zip
ipv6: sr: fix useless rol32 call on hash
The rol32 call is currently rotating hash but the rol'd value is being discarded. I believe the current code is incorrect and hash should be assigned the rotated value returned from rol32. Detected by CoverityScan, CID#1468411 ("Useless call") Fixes: b5facfdba14c ("ipv6: sr: Compute flowlabel for outer IPv6 header of seg6 encap mode") Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: dlebrun@google.com Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/seg6_iptunnel.c')
-rw-r--r--net/ipv6/seg6_iptunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index 19ccf0dc996c..a8854dd3e9c5 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -101,7 +101,7 @@ static __be32 seg6_make_flowlabel(struct net *net, struct sk_buff *skb,
if (do_flowlabel > 0) {
hash = skb_get_hash(skb);
- rol32(hash, 16);
+ hash = rol32(hash, 16);
flowlabel = (__force __be32)hash & IPV6_FLOWLABEL_MASK;
} else if (!do_flowlabel && skb->protocol == htons(ETH_P_IPV6)) {
flowlabel = ip6_flowlabel(inner_hdr);