netfilter: socket: icmp6: fix use-after-scope

[linux-2.6-microblaze.git] / net / ipv6 / netfilter / nf_socket_ipv6.c

diff --git a/net/ipv6/netfilter/nf_socket_ipv6.c b/net/ipv6/netfilter/nf_socket_ipv6.c
index 6fd5474..aa5bb87 100644 (file)
--- a/net/ipv6/netfilter/nf_socket_ipv6.c
+++ b/net/ipv6/netfilter/nf_socket_ipv6.c
@@ -99,7 +99,7 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb,
 {
        __be16 dport, sport;
        const struct in6_addr *daddr = NULL, *saddr = NULL;
-       struct ipv6hdr *iph = ipv6_hdr(skb);
+       struct ipv6hdr *iph = ipv6_hdr(skb), ipv6_var;
        struct sk_buff *data_skb = NULL;
        int doff = 0;
        int thoff = 0, tproto;
@@ -129,8 +129,6 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb,
                        thoff + sizeof(*hp);
 
        } else if (tproto == IPPROTO_ICMPV6) {
-               struct ipv6hdr ipv6_var;
-
                if (extract_icmp6_fields(skb, thoff, &tproto, &saddr, &daddr,
                                         &sport, &dport, &ipv6_var))
                        return NULL;