From 656284f83e97967bcee6cb8ffdea54112abe73a3 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Sun, 22 Aug 2010 21:37:51 +0900
Subject: [PATCH] --- yaml --- r: 215458 b: refs/heads/master c:
 5adbb9fb0c35c38022f79e09fecf15ba8f65f069 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9b990c435e53..c6adac8e3354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc01befdcf3e40979eb518085a075cbf0aacede0
+refs/heads/master: 5adbb9fb0c35c38022f79e09fecf15ba8f65f069
diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c
index 53d892210a04..2fd1ea2c1bb3 100644
--- a/trunk/net/netfilter/nf_conntrack_sip.c
+++ b/trunk/net/netfilter/nf_conntrack_sip.c
@@ -152,6 +152,9 @@ static int parse_addr(const struct nf_conn *ct, const char *cp,
 	const char *end;
 	int ret = 0;
 
+	if (!ct)
+		return 0;
+
 	memset(addr, 0, sizeof(*addr));
 	switch (nf_ct_l3num(ct)) {
 	case AF_INET: