From: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Date: Sun, 4 Mar 2007 23:59:20 +0000 (-0800)
Subject: [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
X-Git-Tag: v2.6.21-rc3~2^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd16704eba171b32ef0cded3a4f562b33b911066;p=linux-2.6-omap-h63xx.git

[NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference

Eliminate possible NULL pointer dereference in nfulnl_recv_config().

Signed-off-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 1b940512d87..b669db56469 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -858,6 +858,9 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
 			ret = -EINVAL;
 			break;
 		}
+
+		if (!inst)
+			goto out;
 	} else {
 		if (!inst) {
 			UDEBUG("no config command, and no instance for "
@@ -911,6 +914,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
 
 out_put:
 	instance_put(inst);
+out:
 	return ret;
 }