Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa584eda authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 465f90a4

net/netfilter/nf_conntrack_sip.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

}