aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2010-08-22 21:37:51 +0900
committerSimon Horman <horms@verge.net.au>2010-10-04 22:45:23 +0900
commit5adbb9fb0c35c38022f79e09fecf15ba8f65f069 (patch)
tree0f9aeaa88762bdafef2c8066d9a378d2b20be6af /net/netfilter
parentbc01befdcf3e40979eb518085a075cbf0aacede0 (diff)
downloadkernel_samsung_aries-5adbb9fb0c35c38022f79e09fecf15ba8f65f069.zip
kernel_samsung_aries-5adbb9fb0c35c38022f79e09fecf15ba8f65f069.tar.gz
kernel_samsung_aries-5adbb9fb0c35c38022f79e09fecf15ba8f65f069.tar.bz2
netfilter: nf_conntrack_sip: Allow ct_sip_get_header() to be called with a null ct argument
Signed-off-by: Simon Horman <horms@verge.net.au> Acked-by: Julian Anastasov <ja@ssi.bg>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_sip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 53d8922..2fd1ea2 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/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: