summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-07-17 17:12:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-25 11:26:10 +0200
commit684f3623927f9d163991c1e99c8909efee536018 (patch)
tree6ed01e27af9991cbc157112ac1dc926b0f5d0ad1 /include
parent3e895f9786d98d49b012d91dae4ef0084825e31d (diff)
downloadlinux-stable-684f3623927f9d163991c1e99c8909efee536018.tar.gz
linux-stable-684f3623927f9d163991c1e99c8909efee536018.tar.bz2
linux-stable-684f3623927f9d163991c1e99c8909efee536018.zip
ipv6: fix useless rol32 call on hash
[ Upstream commit 169dc027fb02492ea37a0575db6a658cf922b854 ] 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. Thanks to David Lebrun for spotting this. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/ipv6.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index a406f2e8680a..aeebbbb9e0bd 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -829,7 +829,7 @@ static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
* to minimize possbility that any useful information to an
* attacker is leaked. Only lower 20 bits are relevant.
*/
- rol32(hash, 16);
+ hash = rol32(hash, 16);
flowlabel = (__force __be32)hash & IPV6_FLOWLABEL_MASK;