Skip to contentSkip to conversation

net-ipv6: Fix alleged compiler warning in ipv6_exthdrs_len()

PATCH In review H.K. Jerry Chu 2 participants 3 messages Dec 15, 2013 – Dec 16, 2013

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

PATCH 1/1 net-ipv6: Fix alleged compiler warning in ipv6_exthdrs_len()

From: Jerry Chu <[email protected]>

It was reported that Commit 299603e8370a93dd5d8e8d800f0dff1ce2c53d36 ("net-gro: Prepare GRO stack for the upcoming tunneling support") triggered a compiler warning in ipv6_exthdrs_len():

net/ipv6/ip6_offload.c: In function ‘ipv6_gro_complete’:
net/ipv6/ip6_offload.c:178:24: warning: ‘optlen’ may be used uninitialized in this function [-Wmaybe-u

    opth = (void *)opth + optlen;
    			^
    net/ipv6/ip6_offload.c:164:22: note: ‘optlen’ was declared here
    int len = 0, proto, optlen;
                        ^

Note that there was no real bug here - optlen was never uninitialized before use. (Was the version of gcc I used smarter to not complain?)

---
 net/ipv6/ip6_offload.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
net/ipv6/ip6_offload.c +3 -6
index 7540a0e..6fb4162 100644
@@ -160,8 +160,8 @@ out:
 static int ipv6_exthdrs_len(struct ipv6hdr *iph,
 			    const struct net_offload **opps)
 {
-	struct ipv6_opt_hdr *opth = NULL;
-	int len = 0, proto, optlen;
+	struct ipv6_opt_hdr *opth = (void *)iph;
+	int len = 0, proto, optlen = sizeof(*iph);
 
 	proto = iph->nexthdr;
 	for (;;) {
@@ -172,10 +172,7 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,
 			if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR))
 				break;
 		}
-		if (opth == NULL)
-			opth = (void *)(iph+1);
-		else
-			opth = (void *)opth + optlen;
+		opth = (void *)opth + optlen;
 		optlen = ipv6_optlen(opth);
 		len += optlen;
 		proto = opth->nexthdr;
Signature · 1 line
1.8.5.1
maintainer
#1 lore raw

From: "H.K. Jerry Chu" <[email protected]>
Date: Sun, 15 Dec 2013 09:19:07 -0800

Quoted 13 lines

From: Jerry Chu <[email protected]>

It was reported that Commit 299603e8370a93dd5d8e8d800f0dff1ce2c53d36 ("net-gro: Prepare GRO stack for the upcoming tunneling support") triggered a compiler warning in ipv6_exthdrs_len():

net/ipv6/ip6_offload.c: In function ‘ipv6_gro_complete’:
net/ipv6/ip6_offload.c:178:24: warning: ‘optlen’ may be used uninitialized in this function [-Wmaybe-u

    opth = (void *)opth + optlen;
    			^
    net/ipv6/ip6_offload.c:164:22: note: ‘optlen’ was declared here
    int len = 0, proto, optlen;
                        ^
Quoted 5 lines

Note that there was no real bug here - optlen was never uninitialized before use. (Was the version of gcc I used smarter to not complain?)

What is this patch against?

It gets rejects when I try to apply it both with Hannes's patch reverted and without it reverted.

author
#2 lore raw
Quoted 19 lines · David Miller

From: "H.K. Jerry Chu" <[email protected]>
Date: Sun, 15 Dec 2013 09:19:07 -0800

Quoted 16 lines

From: Jerry Chu <[email protected]>

It was reported that Commit 299603e8370a93dd5d8e8d800f0dff1ce2c53d36 ("net-gro: Prepare GRO stack for the upcoming tunneling support") triggered a compiler warning in ipv6_exthdrs_len():

net/ipv6/ip6_offload.c: In function ‘ipv6_gro_complete’:
net/ipv6/ip6_offload.c:178:24: warning: ‘optlen’ may be used uninitialized in this function [-Wmaybe-u

    opth = (void *)opth + optlen;
                      ^
    net/ipv6/ip6_offload.c:164:22: note: ‘optlen’ was declared here
    int len = 0, proto, optlen;
                        ^

Note that there was no real bug here - optlen was never uninitialized before use. (Was the version of gcc I used smarter to not complain?)

Quoted 7 lines
Quoted 2 lines

What is this patch against?

It gets rejects when I try to apply it both with Hannes's patch reverted and without it reverted.

It was against net-next of a few days old (and w/o Hannes's patch):

commit 68536053600425c24aba031c45f053d447eedd9c (netnext/master)

Author: Florent Fourcot <[email protected]>
Date:   Thu Dec 12 17:07:58 2013 +0100

ipv6: fix incorrect type in declaration

I just did a git pull and will submit one against the latest net-next. (I did not see any conflict though. Not sure why you can't apply the patch.)

Jerry