aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-11 06:23:12 -0500
committerPatrick McHardy <kaber@trash.net>2010-02-11 06:23:12 -0500
commit54101f4f3bed87fa968b57f77f8ff3b09fd88bcf (patch)
treeca56e07a111a49ca223e0ca0b69e8ab61d011b81 /net/netfilter
parentb87921bdf25485afd8f5a5f25e86b5acef32a9cf (diff)
netfilter: nf_conntrack_sip: fix ct_sip_parse_request() REGISTER request parsing
When requests are parsed, the "sip:" part of the SIP URI should be skipped. Usually this doesn't matter because address parsing skips forward until after the username part, but in case REGISTER requests it doesn't contain a username and the address can not be parsed. Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_sip.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 419c5cabb332..0ca2f2b5c2fa 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -236,12 +236,13 @@ int ct_sip_parse_request(const struct nf_conn *ct,
236 return 0; 236 return 0;
237 237
238 /* Find SIP URI */ 238 /* Find SIP URI */
239 limit -= strlen("sip:"); 239 for (; dptr < limit - strlen("sip:"); dptr++) {
240 for (; dptr < limit; dptr++) {
241 if (*dptr == '\r' || *dptr == '\n') 240 if (*dptr == '\r' || *dptr == '\n')
242 return -1; 241 return -1;
243 if (strnicmp(dptr, "sip:", strlen("sip:")) == 0) 242 if (strnicmp(dptr, "sip:", strlen("sip:")) == 0) {
243 dptr += strlen("sip:");
244 break; 244 break;
245 }
245 } 246 }
246 if (!skp_epaddr_len(ct, dptr, limit, &shift)) 247 if (!skp_epaddr_len(ct, dptr, limit, &shift))
247 return 0; 248 return 0;