From: Dave Jones <davej@redhat.com>
Date: Wed, 20 Apr 2011 03:36:59 +0000 (-0700)
Subject: can: Add missing socket check in can/bcm release.
X-Git-Tag: v2.6.34.11~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2aaab289c94b23f7275e9bb38a927483ff9b1760;p=thirdparty%2Fkernel%2Fstable.git

can: Add missing socket check in can/bcm release.

commit c6914a6f261aca0c9f715f883a353ae7ff51fe83 upstream.

We can get here with a NULL socket argument passed from userspace,
so we need to handle it accordingly.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/net/can/bcm.c b/net/can/bcm.c
index dd23fb1ec5c8d..a6445fd07f2b6 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1426,9 +1426,14 @@ static int bcm_init(struct sock *sk)
 static int bcm_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct bcm_sock *bo = bcm_sk(sk);
+	struct bcm_sock *bo;
 	struct bcm_op *op, *next;
 
+	if (sk == NULL)
+		return 0;
+
+	bo = bcm_sk(sk);
+
 	/* remove bcm_ops, timer, rx_unregister(), etc. */
 
 	unregister_netdevice_notifier(&bo->notifier);