From 4805df03a5afea56554b80ed348f08baa5594eb7 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 14 Aug 2007 13:13:54 -0700
Subject: [PATCH] --- yaml --- r: 64063 b: refs/heads/master c:
 465f90a486cd724d364167747e8b8b9f806fa91a h: refs/heads/master i:   64061:
 93fcb4be7ca92cc1d509f94bffdb3a013a8e11d2   64059:
 2522656b870999f2d2483125b3f6356da21c3278   64055:
 3807f833c1ad5b55b8404f6d301c90850ff397ff   64047:
 c0eb27781128d4bad3f61557015260fbae804c08   64031:
 027a8c479e403934d6a2404b5b1d1943d5c67d44   63999:
 52f3550bfbfb933129ec064457126de1a733f355 v: v3

---
 [refs]                                 | 2 +-
 trunk/net/netfilter/nf_conntrack_sip.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3002dc8ddfdb..41356eec6f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35019539d71bacd98de318c34728c97b1b505b49
+refs/heads/master: 465f90a486cd724d364167747e8b8b9f806fa91a
diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c
index 1276a442f10c..5cc9636e46e9 100644
--- a/trunk/net/netfilter/nf_conntrack_sip.c
+++ b/trunk/net/netfilter/nf_conntrack_sip.c
@@ -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;
 		}