diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-08-14 13:14:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-08-14 13:14:35 -0700 |
| commit | aa584eda5d2002097de9f608b362d9150730abd7 (patch) | |
| tree | 1885f67c19755f4aba3eb20144483bb92966bf52 /net | |
| parent | 465f90a486cd724d364167747e8b8b9f806fa91a (diff) | |
| download | blackbird-op-linux-aa584eda5d2002097de9f608b362d9150730abd7.tar.gz blackbird-op-linux-aa584eda5d2002097de9f608b362d9150730abd7.zip | |
[NETFILTER]: nf_conntrack_sip: fix SIP-URI parsing
The userinfo component of a SIP-URI is optional, continue parsing at the
beginning of the SIP-URI in case its not found.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 5cc9636e46e9..d449fa47491c 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -295,6 +295,7 @@ static int epaddr_len(struct nf_conn *ct, const char *dptr, static int skp_epaddr_len(struct nf_conn *ct, const char *dptr, const char *limit, int *shift) { + const char *start = dptr; int s = *shift; /* Search for @, but stop at the end of the line. @@ -309,8 +310,10 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr, if (dptr <= limit && *dptr == '@') { dptr++; (*shift)++; - } else + } else { + dptr = start; *shift = s; + } return epaddr_len(ct, dptr, limit, shift); } |
