[PATCH] can: check for null sk before deferencing it via the call to sock_net

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Colin King <colin.king@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH] can: check for null sk before deferencing it via the call to sock_net
Date	Fri, 08 Sep 2017 17:10:01 +0200
Message-ID	<unt4R-jD-13@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 2.14.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	39
Organization	linux.* mail to news gateway
X-Original-Cc	kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Fri, 8 Sep 2017 16:02:35 +0100
X-Original-Message-ID	<20170908150235.2931-1-colin.king@canonical.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1729011

Show key headers only | View raw

From: Colin Ian King <colin.king@canonical.com>

The assignment of net via call sock_net will dereference sk. This
is performed before a sanity null check on sk, so there could be
a potential null dereference on the sock_net call if sk is null.
Fix this by assigning net after the sk null check. Also replace
the sk == NULL with the more usual !sk idiom.

Detected by CoverityScan CID#1431862 ("Dereference before null check")

Fixes: 384317ef4187 ("can: network namespace support for CAN_BCM protocol")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 net/can/bcm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 47a8748d953a..a3791674b8ce 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1493,13 +1493,14 @@ static int bcm_init(struct sock *sk)
 static int bcm_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct net *net = sock_net(sk);
+	struct net *net;
 	struct bcm_sock *bo;
 	struct bcm_op *op, *next;
 
-	if (sk == NULL)
+	if (!sk)
 		return 0;
 
+	net = sock_net(sk);
 	bo = bcm_sk(sk);
 
 	/* remove bcm_ops, timer, rx_unregister(), etc. */
-- 
2.14.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] can: check for null sk before deferencing it via the call to sock_net Colin King <colin.king@canonical.com> - 2017-09-08 17:10 +0200
  Re: [PATCH] can: check for null sk before deferencing it via the call  to sock_net Oliver Hartkopp <socketcan@hartkopp.net> - 2017-09-08 19:50 +0200

csiph-web