From 27fb517f4fff38ed4b7e210445922edff44d751a Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Tue, 21 Sep 2010 21:17:34 +0000 Subject: [PATCH] --- yaml --- r: 211099 b: refs/heads/master c: cbdd769ab9de26764bde0520a91536caa1587e13 h: refs/heads/master i: 211097: 4efff565e5537e56922f78f96441643460e6fdf9 211095: a4dbd72a1191c6d975fb5735afcca49c19fa1fac v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a98e83795b2d..2e70dd079853 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6120b8afacec587f5feb37781bc751bc5d68a10 +refs/heads/master: cbdd769ab9de26764bde0520a91536caa1587e13 diff --git a/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c b/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c index eab8de32f200..f3a9b42b16c6 100644 --- a/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c +++ b/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c @@ -66,9 +66,11 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { + struct sock *sk = skb->sk; struct inet_sock *inet = inet_sk(skb->sk); - if (inet && inet->nodefrag) + if (sk && (sk->sk_family == PF_INET) && + inet->nodefrag) return NF_ACCEPT; #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)