OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: nf_conntrack_sip: use strlen/strcmp 

Replace sizeof/memcmp by strlen/strcmp. Use case-insensitive comparison
for SIP methods and the SIP/2.0 string, as specified in RFC 3261.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2008-03-25 20:17:36 -07:00 committed by David S. Miller
parent 212440a7d0
commit 779382eb32
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/netfilter/nf_nat_sip.c
View File

@ -94,12 +94,12 @@ static int map_sip_addr(struct sk_buff *skb,
if ((matchlen == map->addr[dir].srciplen || if ((matchlen == map->addr[dir].srciplen ||
matchlen == map->addr[dir].srclen) && matchlen == map->addr[dir].srclen) &&
memcmp(*dptr + matchoff, map->addr[dir].src, matchlen) == 0) { strncmp(*dptr + matchoff, map->addr[dir].src, matchlen) == 0) {
addr = map->addr[!dir].dst; addr = map->addr[!dir].dst;
addrlen = map->addr[!dir].dstlen; addrlen = map->addr[!dir].dstlen;
} else if ((matchlen == map->addr[dir].dstiplen || } else if ((matchlen == map->addr[dir].dstiplen ||
matchlen == map->addr[dir].dstlen) && matchlen == map->addr[dir].dstlen) &&
memcmp(*dptr + matchoff, map->addr[dir].dst, matchlen) == 0) { strncmp(*dptr + matchoff, map->addr[dir].dst, matchlen) == 0) {
addr = map->addr[!dir].src; addr = map->addr[!dir].src;
addrlen = map->addr[!dir].srclen; addrlen = map->addr[!dir].srclen;
} else } else
@ -117,20 +117,20 @@ static unsigned int ip_nat_sip(struct sk_buff *skb,
enum sip_header_pos pos; enum sip_header_pos pos;
struct addr_map map; struct addr_map map;
if (*datalen < sizeof("SIP/2.0") - 1) if (*datalen < strlen("SIP/2.0"))
return NF_ACCEPT; return NF_ACCEPT;
addr_map_init(ct, &map); addr_map_init(ct, &map);
/* Basic rules: requests and responses. */ /* Basic rules: requests and responses. */
if (strncmp(*dptr, "SIP/2.0", sizeof("SIP/2.0") - 1) != 0) { if (strnicmp(*dptr, "SIP/2.0", strlen("SIP/2.0")) != 0) {
/* 10.2: Constructing the REGISTER Request: /* 10.2: Constructing the REGISTER Request:
* *
* The "userinfo" and "@" components of the SIP URI MUST NOT * The "userinfo" and "@" components of the SIP URI MUST NOT
* be present. * be present.
*/ */
if (*datalen >= sizeof("REGISTER") - 1 && if (*datalen >= strlen("REGISTER") &&
strncmp(*dptr, "REGISTER", sizeof("REGISTER") - 1) == 0) strnicmp(*dptr, "REGISTER", strlen("REGISTER")) == 0)
pos = POS_REG_REQ_URI; pos = POS_REG_REQ_URI;
else else
pos = POS_REQ_URI; pos = POS_REQ_URI;

12
net/netfilter/nf_conntrack_sip.c
View File

@ -434,15 +434,15 @@ static int sip_help(struct sk_buff *skb,
} }
datalen = skb->len - dataoff; datalen = skb->len - dataoff;
if (datalen < sizeof("SIP/2.0 200") - 1) if (datalen < strlen("SIP/2.0 200"))
goto out; goto out;
/* RTP info only in some SDP pkts */ /* RTP info only in some SDP pkts */
if (memcmp(dptr, "INVITE", sizeof("INVITE") - 1) != 0 && if (strnicmp(dptr, "INVITE", strlen("INVITE")) != 0 &&
memcmp(dptr, "UPDATE", sizeof("UPDATE") - 1) != 0 && strnicmp(dptr, "UPDATE", strlen("UPDATE")) != 0 &&
memcmp(dptr, "SIP/2.0 180", sizeof("SIP/2.0 180") - 1) != 0 && strnicmp(dptr, "SIP/2.0 180", strlen("SIP/2.0 180")) != 0 &&
memcmp(dptr, "SIP/2.0 183", sizeof("SIP/2.0 183") - 1) != 0 && strnicmp(dptr, "SIP/2.0 183", strlen("SIP/2.0 183")) != 0 &&
memcmp(dptr, "SIP/2.0 200", sizeof("SIP/2.0 200") - 1) != 0) { strnicmp(dptr, "SIP/2.0 200", strlen("SIP/2.0 200")) != 0) {
goto out; goto out;
} }
/* Get address and port from SDP packet. */ /* Get address and port from SDP packet. */