summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-09-01 18:11:04 -0700
committerDavid S. Miller <davem@davemloft.net>2015-09-01 20:20:02 -0700
commitde4c1f8ba302ccf4f2b3b17dc614b0a0b14d351a (patch)
treeb8fb3ed074d6752702b7e31628cf19c454aab164
parent1bd40543534578f20889d5e999a0f184fd7ea88f (diff)
downloadlinux-de4c1f8ba302ccf4f2b3b17dc614b0a0b14d351a.tar.bz2
flow_dissector: Fix function argument ordering dependency
Commit c6cc1ca7f4d70c ("flowi: Abstract out functions to get flow hash based on flowi") introduced a bug in __skb_set_sw_hash where we require a dependency on evaluating arguments in a function in order. There is no such ordering enforced in C, so this incorrect. This patch fixes that by splitting out the arguments. This bug was found via a compiler warning that keys may be uninitialized. Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/skbuff.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9e62687c70f3..eabfb810bc62 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1035,9 +1035,9 @@ static inline __u32 skb_get_hash_flowi6(struct sk_buff *skb, struct flowi6 *fl6)
{
if (!skb->l4_hash && !skb->sw_hash) {
struct flow_keys keys;
+ __u32 hash = __get_hash_from_flowi6(fl6, &keys);
- __skb_set_sw_hash(skb, __get_hash_from_flowi6(fl6, &keys),
- flow_keys_have_l4(&keys));
+ __skb_set_sw_hash(skb, hash, flow_keys_have_l4(&keys));
}
return skb->hash;
@@ -1049,9 +1049,9 @@ static inline __u32 skb_get_hash_flowi4(struct sk_buff *skb, struct flowi4 *fl4)
{
if (!skb->l4_hash && !skb->sw_hash) {
struct flow_keys keys;
+ __u32 hash = __get_hash_from_flowi4(fl4, &keys);
- __skb_set_sw_hash(skb, __get_hash_from_flowi4(fl4, &keys),
- flow_keys_have_l4(&keys));
+ __skb_set_sw_hash(skb, hash, flow_keys_have_l4(&keys));
}
return skb->hash;