Commit 810c23a3 authored by Jerry Chu's avatar Jerry Chu Committed by David S. Miller

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

It was reported that Commit 299603e8
("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?)
Reported-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarH.K. Jerry Chu <hkchu@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ed2a0d0
...@@ -160,8 +160,8 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, ...@@ -160,8 +160,8 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
static int ipv6_exthdrs_len(struct ipv6hdr *iph, static int ipv6_exthdrs_len(struct ipv6hdr *iph,
const struct net_offload **opps) const struct net_offload **opps)
{ {
struct ipv6_opt_hdr *opth = NULL; struct ipv6_opt_hdr *opth = (void *)iph;
int len = 0, optlen = 0, proto; int len = 0, proto, optlen = sizeof(*iph);
proto = iph->nexthdr; proto = iph->nexthdr;
for (;;) { for (;;) {
...@@ -172,12 +172,8 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph, ...@@ -172,12 +172,8 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,
if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR)) if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR))
break; break;
} }
if (opth == NULL) { opth = (void *)opth + optlen;
opth = (void *)(iph+1); optlen = ipv6_optlen(opth);
} else {
optlen = ipv6_optlen(opth);
opth = (void *)opth + optlen;
}
len += optlen; len += optlen;
proto = opth->nexthdr; proto = opth->nexthdr;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment