Thread (2 messages) 2 messages, 2 authors, 2011-05-13

Re: linux-next: build warning after merge of the net tree

From: David Miller <davem@davemloft.net>
Date: 2011-05-13 03:04:23
Also in: linux-next, lkml
Subsystem: networking [general], networking [ipv4/ipv6], the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds

From: Stephen Rothwell <redacted>
Date: Fri, 13 May 2011 11:41:39 +1000
After merging the net tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

net/ipv4/ip_forward.c: In function 'ip_forward':
net/ipv4/ip_forward.c:87: warning: 'iph' may be used uninitialized in this function

Introduced by commit def57687e957 ("ipv4: Elide use of rt->rt_dst in
ip_forward()").  It may be a false positive, but it is not obvious how
iph is assigned before being used.
My compiler didn't warn, (and I just double checked this) which is
weird.  Sigh.

Thanks, here is the fix I'll push:

--------------------
ipv4: Fix 'iph' use before set.

I swear none of my compilers warned about this, yet it is so
obvious.
net/ipv4/ip_forward.c: In function 'ip_forward':
net/ipv4/ip_forward.c:87: warning: 'iph' may be used uninitialized in this function
Reported-by: Stephen Rothwell <redacted>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/ipv4/ip_forward.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index fcbc0c8..3b34d1c 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -84,7 +84,7 @@ int ip_forward(struct sk_buff *skb)
 
 	rt = skb_rtable(skb);
 
-	if (opt->is_strictroute && iph->daddr != rt->rt_gateway)
+	if (opt->is_strictroute && ip_hdr(skb)->daddr != rt->rt_gateway)
 		goto sr_failed;
 
 	if (unlikely(skb->len > dst_mtu(&rt->dst) && !skb_is_gso(skb) &&
-- 
1.7.4.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help