Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
ipv6: fix compiler warning in ipv6_exthdrs_len
Browse files Browse the repository at this point in the history
Commit 299603e ("net-gro: Prepare GRO
stack for the upcoming tunneling support") used an uninitialized variable
which leads to the following compiler warning:

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-uninitialized]
    opth = (void *)opth + optlen;
                        ^
net/ipv6/ip6_offload.c:164:22: note: ‘optlen’ was declared here
  int len = 0, proto, optlen;
                      ^
Fix it up.

Cc: Jerry Chu <hkchu@google.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
strssndktn authored and davem330 committed Dec 14, 2013
1 parent df01216 commit f52d81d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/ipv6/ip6_offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,
const struct net_offload **opps)
{
struct ipv6_opt_hdr *opth = NULL;
int len = 0, proto, optlen;
int len = 0, optlen = 0, proto;

proto = iph->nexthdr;
for (;;) {
Expand All @@ -172,11 +172,12 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,
if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR))
break;
}
if (opth == NULL)
if (opth == NULL) {
opth = (void *)(iph+1);
else
} else {
optlen = ipv6_optlen(opth);
opth = (void *)opth + optlen;
optlen = ipv6_optlen(opth);
}
len += optlen;
proto = opth->nexthdr;
}
Expand Down

0 comments on commit f52d81d

Please sign in to comment.