flow_dissector: Fix function argument ordering dependency
Subsystems (2)
PATCH 1/1 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.
--- include/linux/skbuff.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/skbuff.h +4 -4
@@ -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;
Signature · 1 line
1.8.1
Quoted 6 lines · Tom Herbert
Commit
c6cc1ca7f4d70c("flowi: Abstract out functions to get flow hash based on flowi") introduced a bug in__skb_set_sw_hashwhere 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.
To help the reader know a bit more about how these functions operate, perhaps it'd also be useful/better to mark arguments as const where appropriate.
I didn't look to see if any other functions could have the flow related args as const.
The __get_hash_from_flowi6 and flow_keys_have_l4 functions could be:
--- include/net/flow.h | 2 +- include/net/flow_dissector.h | 2 +- net/core/flow_dissector.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/net/flow.h +1 -1
@@ -244,7 +244,7 @@ void flow_cache_flush(struct net *net);void flow_cache_flush_deferred (struct net *net);extern atomic_t flow_cache_genid; -__u32 __get_hash_from_flowi6 (struct flowi6 *fl6,struct flow_keys *keys); +__u32 __get_hash_from_flowi6 (const struct flowi6 *fl6,struct flow_keys *keys);static inline __u32 get_hash_from_flowi6 (struct flowi6 *fl6) {
include/net/flow_dissector.h +1 -1
@@ -177,7 +177,7 @@ struct flow_keys_digest {void make_flow_keys_digest (struct flow_keys_digest *digest,const struct flow_keys *flow); -static inline bool flow_keys_have_l4 (struct flow_keys *keys) +static inline bool flow_keys_have_l4 (const struct flow_keys *keys) {return (keys->ports.ports || keys->tags.flow_label); }
net/core/flow_dissector.c +1 -1
@@ -787,7 +787,7 @@ u32 skb_get_poff(const struct sk_buff *skb)return __skb_get_poff (skb, skb->data, &keys,skb_headlen (skb)); } -__u32 __get_hash_from_flowi6 (struct flowi6 *fl6,struct flow_keys *keys) +__u32 __get_hash_from_flowi6 (const struct flowi6 *fl6,struct flow_keys *keys) {memset (keys,0 ,sizeof (*keys));
From: Tom Herbert <[email protected]>
Date: Tue, 1 Sep 2015 18:11:04 -0700
Quoted 8 lines
Commit
c6cc1ca7f4d70c("flowi: Abstract out functions to get flow hash based on flowi") introduced a bug in__skb_set_sw_hashwhere 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 <[email protected]>
Applied.