Patchwork netfilter: nf_conntrack_sip: don't drop packets with offsets pointing outside the packet

login
register
mail settings
Submitter Patrick McHardy
Date April 5, 2013, 6:13 p.m.
Message ID <1365185610-2287-1-git-send-email-kaber@trash.net>
Download mbox | patch
Permalink /patch/234241/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Patrick McHardy - April 5, 2013, 6:13 p.m.
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>
---
 net/netfilter/nf_conntrack_sip.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Pablo Neira - April 6, 2013, 12:04 p.m.
On Fri, Apr 05, 2013 at 08:13:30PM +0200, Patrick McHardy wrote:
> 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.

Applied, thanks
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 0e7d423..e0c4373 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1593,10 +1593,8 @@  static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,
 		end += strlen("\r\n\r\n") + clen;
 
 		msglen = origlen = end - dptr;
-		if (msglen > datalen) {
-			nf_ct_helper_log(skb, ct, "incomplete/bad SIP message");
-			return NF_DROP;
-		}
+		if (msglen > datalen)
+			return NF_ACCEPT;
 
 		ret = process_sip_msg(skb, ct, protoff, dataoff,
 				      &dptr, &msglen);