Skip to contentSkip to conversation

bpf: silence uninitialized var warning in bpf_skb_net_grow

PATCH Applied Willem de Bruijn 2 participants 2 messages Mar 23, 2019 – Mar 24, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bpf: silence uninitialized var warning in bpf_skb_net_grow

From: Willem de Bruijn <[email protected]>

These three variables are set in one branch and used in another with the same condition. But on some architectures they still generate compiler warnings of the kind:

warning: 'inner_trans' may be used uninitialized in this function [-Wmaybe-uninitialized]

Silence these false positives. Use the straightforward approach to always initialize them, if a bit superfluous.

Fixes 868d523535c2 ("bpf: add bpf_skb_adjust_room encap flags")

--
v1->v2: add missing word in fixes tag

---
 net/core/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/filter.c +1 -1
index 0a972fbf60df..22eb2edf5573 100644
@@ -2975,8 +2975,8 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff,
 			    u64 flags)
 {
 	bool encap = flags & BPF_F_ADJ_ROOM_ENCAP_L3_MASK;
+	u16 mac_len = 0, inner_net = 0, inner_trans = 0;
 	unsigned int gso_type = SKB_GSO_DODGY;
-	u16 mac_len, inner_net, inner_trans;
 	int ret;
 
 	if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) {
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#1 lore raw
Quoted 7 lines · Willem de Bruijn

From: Willem de Bruijn <[email protected]>

These three variables are set in one branch and used in another with the same condition. But on some architectures they still generate compiler warnings of the kind:

Quoted 8 lines

warning: 'inner_trans' may be used uninitialized in this function [-Wmaybe-uninitialized]

Silence these false positives. Use the straightforward approach to always initialize them, if a bit superfluous.

Fixes 868d523535c2 ("bpf: add bpf_skb_adjust_room encap flags")

applied. thanks!