]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: nf_conntrack_sip: check sname != NULL before calling strncmp
authorPatrick McHardy <kaber@trash.net>
Tue, 14 Aug 2007 20:13:54 +0000 (13:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Aug 2007 20:13:54 +0000 (13:13 -0700)
The check got lost during the conversion to nf_conntrack.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_sip.c

index 1276a442f10c53936d021be834631860285fd660..5cc9636e46e9f3fef1be918caf6aa18ef7cac790 100644 (file)
@@ -330,7 +330,8 @@ int ct_sip_get_info(struct nf_conn *ct,
 
        while (dptr <= limit) {
                if ((strncmp(dptr, hnfo->lname, hnfo->lnlen) != 0) &&
-                   (strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {
+                   (hnfo->sname == NULL ||
+                    strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {
                        dptr++;
                        continue;
                }