aboutsummaryrefslogtreecommitdiff
path: root/net/netfilter/xt_socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-09 18:07:44 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-09 18:07:44 -0400
commita49d1a905ed96c7a790d9535e2bc62d3f2f55a05 (patch)
tree709bdaab23aa7ef98aad0cdfd4d8ecd8324650cc /net/netfilter/xt_socket.c
parent2e7d21c54adbab6d10481eddc685328f89bb6389 (diff)
parent0197dee7d3182bb6b6a21955860dfa14fa022d84 (diff)
Merge git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/netfilter/xt_socket.c')
-rw-r--r--net/netfilter/xt_socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 72bb07f57f9..9ea482d08cf 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -263,10 +263,10 @@ socket_mt6_v1(const struct sk_buff *skb, struct xt_action_param *par)
struct sock *sk;
struct in6_addr *daddr, *saddr;
__be16 dport, sport;
- int thoff, tproto;
+ int thoff = 0, tproto;
const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
- tproto = ipv6_find_hdr(skb, &thoff, -1, NULL);
+ tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);
if (tproto < 0) {
pr_debug("unable to find transport header in IPv6 packet, dropping\n");
return NF_DROP;