From: Ulrich Weber <ulrich.weber@riverbed.com>
To: netfilter@vger.kernel.org
Cc: kaber@trash.net
Subject: [PATCH] nf_conntrack_sip: check for trailing spaces
Date: Tue, 18 Oct 2016 11:13:18 +0200 [thread overview]
Message-ID: <20161018091318.GA20644@gir> (raw)
on SIP requests, so a fragmented TCP SIP packet starting with
INVITE,NOTIFY,OPTIONS,REFER,REGISTER,UPDATE,SUBSCRIBE
Content-Length: 0
will not bet interpreted as an INVITE request.
Confirm with RFC 3261
Request-Line = Method SP Request-URI SP SIP-Version CRLF
Signed-off-by: Ulrich Weber <ulrich.weber@riverbed.com>
---
net/netfilter/nf_conntrack_sip.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 7700556..e37f8da 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1436,9 +1436,11 @@ static int process_sip_request(struct sk_buff *skb, unsigned int protoff,
handler = &sip_handlers[i];
if (handler->request == NULL)
continue;
- if (*datalen < handler->len ||
+ if (*datalen < handler->len + 1 ||
strncasecmp(*dptr, handler->method, handler->len))
continue;
+ if ((*dptr)[handler->len] != ' ')
+ continue;
if (ct_sip_get_header(ct, *dptr, 0, *datalen, SIP_HDR_CSEQ,
&matchoff, &matchlen) <= 0) {
--
2.7.4
next reply other threads:[~2016-10-18 9:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 9:13 Ulrich Weber [this message]
2016-10-18 21:47 ` [PATCH] nf_conntrack_sip: check for trailing spaces Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2016-10-19 8:24 Ulrich Weber
2016-10-20 18:17 ` Pablo Neira Ayuso
2016-10-24 16:05 ` Ulrich Weber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161018091318.GA20644@gir \
--to=ulrich.weber@riverbed.com \
--cc=kaber@trash.net \
--cc=netfilter@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.