Mailing List Archive

[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>

---
commit 492d0e43049e7f420c1c64044ab57abf278fbead
tree d5b5da1b2109b78f28fa8748bcb33e573be85e5a
parent c58af8c25d20e59644356f78e055eeba9edb8aae
author Patrick McHardy <kaber@trash.net> Tue, 14 Aug 2007 18:37:25 +0200
committer Patrick McHardy <kaber@trash.net> Tue, 14 Aug 2007 18:37:25 +0200

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 5cc9636..d449fa4 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);
}