diff options
| author | Scott Brissenden <sbrissen@hotmail.com> | 2014-01-20 13:10:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-01-20 13:10:45 +0000 |
| commit | a39d6519b691ce3eaae80c6b6c420e5e90eb7b56 (patch) | |
| tree | 18af26f5ca571fdd9a961313a2afcf58917dba1b | |
| parent | fc2c3ebcd40150a0a9ae81a40ca14c8709bea943 (diff) | |
| parent | 210d1e111b6d4dd16f981b8a1330ca9c5f90d71f (diff) | |
| download | kernel_samsung_smdk4412-a39d6519b691ce3eaae80c6b6c420e5e90eb7b56.zip kernel_samsung_smdk4412-a39d6519b691ce3eaae80c6b6c420e5e90eb7b56.tar.gz kernel_samsung_smdk4412-a39d6519b691ce3eaae80c6b6c420e5e90eb7b56.tar.bz2 | |
Merge "netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet" into cm-11.0
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 93faf6a..4a8c55b 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -1468,7 +1468,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff, msglen = origlen = end - dptr; if (msglen > datalen) - return NF_DROP; + return NF_ACCEPT; ret = process_sip_msg(skb, ct, dataoff, &dptr, &msglen); if (ret != NF_ACCEPT) |