From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 1 Nov 2006 00:59:35 +0000 (-0800)
Subject: [TIPC] net/tipc/port.c: fix NULL dereference
X-Git-Tag: v2.6.19-rc5~68^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d55b4c631e89a008e80b003e5aa4291d9ec800ac;p=linux-2.6

[TIPC] net/tipc/port.c: fix NULL dereference

The correct order is: NULL check before dereference

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tipc/port.c b/net/tipc/port.c
index c1a1a76759..b7f3199523 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -1136,11 +1136,12 @@ int tipc_publish(u32 ref, unsigned int scope, struct tipc_name_seq const *seq)
 	int res = -EINVAL;
 
 	p_ptr = tipc_port_lock(ref);
+	if (!p_ptr)
+		return -EINVAL;
+
 	dbg("tipc_publ %u, p_ptr = %x, conn = %x, scope = %x, "
 	    "lower = %u, upper = %u\n",
 	    ref, p_ptr, p_ptr->publ.connected, scope, seq->lower, seq->upper);
-	if (!p_ptr)
-		return -EINVAL;
 	if (p_ptr->publ.connected)
 		goto exit;
 	if (seq->lower > seq->upper)