From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 26 Nov 2008 00:50:30 +0000 (-0800)
Subject: ipv6: fix warning in net/ipv6/ip6_flowlabel.c
X-Git-Tag: v2.6.29-rc1~581^2~474
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=55205d400efe3260e29ad26dd64c992cec2efafd;p=linux-2.6-omap-h63xx.git

ipv6: fix warning in net/ipv6/ip6_flowlabel.c

this warning:

  net/ipv6/ip6_flowlabel.c: In function ‘ipv6_flowlabel_opt’:
  net/ipv6/ip6_flowlabel.c:467: warning: ‘err’ may be used uninitialized in this function

triggers because GCC does not recognize the (correct) error flow
between fl_create() and 'err'.

Annotate it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 7927a8498d1..5656e8aa47d 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -464,7 +464,7 @@ static inline void fl_link(struct ipv6_pinfo *np, struct ipv6_fl_socklist *sfl,
 
 int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
 {
-	int err;
+	int uninitialized_var(err);
 	struct net *net = sock_net(sk);
 	struct ipv6_pinfo *np = inet6_sk(sk);
 	struct in6_flowlabel_req freq;