Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 635c223c authored by Gao Feng's avatar Gao Feng Committed by David S. Miller
Browse files

rps: flow_dissector: Fix uninitialized flow_keys used in __skb_get_hash possibly 



The original codes depend on that the function parameters are evaluated from
left to right. But the parameter's evaluation order is not defined in C
standard actually.

When flow_keys_have_l4(&keys) is invoked before ___skb_get_hash(skb, &keys,
hashrnd) with some compilers or environment, the keys passed to
flow_keys_have_l4 is not initialized.

Fixes: 6db61d79 ("flow_dissector: Ignore flow dissector return value from ___skb_get_hash")

Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28b346cb

net/core/flow_dissector.c

+4 −2
Original line number Diff line number Diff line
@@ -680,11 +680,13 @@ EXPORT_SYMBOL_GPL(__skb_get_hash_symmetric); 
void __skb_get_hash(struct sk_buff *skb)

{

	struct flow_keys keys;

	u32 hash;



	__flow_hash_secret_init();



	__skb_set_sw_hash(skb, ___skb_get_hash(skb, &keys, hashrnd),

			  flow_keys_have_l4(&keys));

	hash = ___skb_get_hash(skb, &keys, hashrnd);



	__skb_set_sw_hash(skb, hash, flow_keys_have_l4(&keys));

}

EXPORT_SYMBOL(__skb_get_hash);