aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy2013-04-05 03:13:30 -0500
committerGreg Kroah-Hartman2013-05-11 15:53:55 -0500
commitbc73e38cee0626945a70cb0c2d873aaae3795130 (patch)
tree5d48cf0aece2c6c080aa1539fb959c2f532adf03 /net
parent41a460c403b5157c4c7b93190688b897c2d78313 (diff)
downloadkernel-video-bc73e38cee0626945a70cb0c2d873aaae3795130.tar.gz
kernel-video-bc73e38cee0626945a70cb0c2d873aaae3795130.tar.xz
kernel-video-bc73e38cee0626945a70cb0c2d873aaae3795130.zip
netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet
commit 3a7b21eaf4fb3c971bdb47a98f570550ddfe4471 upstream. Some Cisco phones create huge messages that are spread over multiple packets. After calculating the offset of the SIP body, it is validated to be within the packet and the packet is dropped otherwise. This breaks operation of these phones. Since connection tracking is supposed to be passive, just let those packets pass unmodified and untracked. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index df8f4f28448..b4e0d1c23cd 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1547,7 +1547,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,
1547 1547
1548 msglen = origlen = end - dptr; 1548 msglen = origlen = end - dptr;
1549 if (msglen > datalen) 1549 if (msglen > datalen)
1550 return NF_DROP; 1550 return NF_ACCEPT;
1551 1551
1552 ret = process_sip_msg(skb, ct, protoff, dataoff, 1552 ret = process_sip_msg(skb, ct, protoff, dataoff,
1553 &dptr, &msglen); 1553 &dptr, &msglen);