Skip to contentSkip to conversation

net: xfrm: pass constant family to nf_hook function

PATCH In review Florian Westphal 2 participants 5 messages Sep 21, 2018

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

PATCH 1/1 net: xfrm: pass constant family to nf_hook function

Unfortunately some versions of gcc emit following warning:
linux/compiler.h:252:20: warning: array subscript is above array bounds [-Warray-bounds]

  hook_head = rcu_dereference(net->nf.hooks_arp[hook]);
                              ^~~~~~~~~~~~~~~~~~~~~

xfrm_output_resume passes non-const 'pf' argument so compiler can't know that the affected statement above will never be executed (we only pass either NFPROTO_IPV4 or NFPROTO_IPV6), this change makes this explicit.

Another solution would be to increase hooks_arp[] size, but that increases struct net size needlesly.

---
David, i hope this will silence the warning, would be nice if you could test it.

I don't really like this patch, but I see no better solution expect needless increase of hooks_arp[].

Any other idea?

 net/xfrm/xfrm_output.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
net/xfrm/xfrm_output.c +18 -5
index 45ba07ab3e4f..199c0e782ac7 100644
@@ -152,11 +152,24 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
 		if (!skb_dst(skb)->xfrm)
 			return dst_output(net, skb->sk, skb);
 
-		err = nf_hook(skb_dst(skb)->ops->family,
-			      NF_INET_POST_ROUTING, net, skb->sk, skb,
-			      NULL, skb_dst(skb)->dev, xfrm_output2);
-		if (unlikely(err != 1))
-			goto out;
+		switch (skb_dst(skb)->ops->family) {
+		case AF_INET:
+			err = nf_hook(NFPROTO_IPV4,
+				      NF_INET_POST_ROUTING, net, skb->sk, skb,
+				      NULL, skb_dst(skb)->dev, xfrm_output2);
+			if (unlikely(err != 1))
+				goto out;
+			break;
+		case AF_INET6:
+			err = nf_hook(NFPROTO_IPV6,
+				      NF_INET_POST_ROUTING, net, skb->sk, skb,
+				      NULL, skb_dst(skb)->dev, xfrm_output2);
+			if (unlikely(err != 1))
+				goto out;
+			break;
+		default:
+			break;
+		}
 	}
 
 	if (err == -EINPROGRESS)
Signature · 1 line
2.16.4
#1 lore raw
Quoted 9 lines · Florian Westphal

Unfortunately some versions of gcc emit following warning:
linux/compiler.h:252:20: warning: array subscript is above array bounds [-Warray-bounds]

  hook_head = rcu_dereference(net->nf.hooks_arp[hook]);
                              ^~~~~~~~~~~~~~~~~~~~~

xfrm_output_resume passes non-const 'pf' argument so compiler can't know that the affected statement above will never be executed (we only pass either NFPROTO_IPV4 or NFPROTO_IPV6), this change makes this explicit.

Quoted 8 lines

Another solution would be to increase hooks_arp[] size, but that increases struct net size needlesly.

---
David, i hope this will silence the warning, would be nice if you could test it.

I still the warning.

Quoted 6 lines

I don't really like this patch, but I see no better solution expect needless increase of hooks_arp[].

Any other idea?

I don't have any time in the next week to look into it.

Sounds like you are not able to reproduce the output. It just debian stretch and gcc version 6.3.0 20170516 (Debian 6.3.0-18+deb9u1).

#2 lore raw
Quoted 4 lines · David Ahern
Quoted 2 lines

David, i hope this will silence the warning, would be nice if you could test it.

I still the warning.

Wait. Do you see this warning everywhere or just in xfrm?

#3 lore raw
Quoted 8 lines · Florian Westphal
Quoted 4 lines · David Ahern
Quoted 2 lines

David, i hope this will silence the warning, would be nice if you could test it.

I still the warning.

Wait. Do you see this warning everywhere or just in xfrm?

just the one file.

#4 lore raw
Quoted 11 lines · David Ahern
Quoted 8 lines · Florian Westphal
Quoted 4 lines · David Ahern
Quoted 2 lines

David, i hope this will silence the warning, would be nice if you could test it.

I still the warning.

Wait. Do you see this warning everywhere or just in xfrm?

just the one file.

Sigh, ok, i will set up a vm and deal with this somehow.

Steffen, please toss this patch, sorry for the noise.