aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2011-04-20 01:57:15 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-09 15:06:50 -0700
commit8bd26179f756612921ff54dbf4f9d2bd0afa01cd (patch)
treec24d78192e27ec3a12dc1ea3daefa3d2090b4bd8
parent8fac1f02574d9b19a805d19cea24bc74d19cd3e4 (diff)
can: add missing socket check in can/raw release
commit 10022a6c66e199d8f61d9044543f38785713cbbd upstream. v2: added space after 'if' according code style. We can get here with a NULL socket argument passed from userspace, so we need to handle it accordingly. Thanks to Dave Jones pointing at this issue in net/can/bcm.c Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/can/raw.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index 883e9d74fdd..241b2b60c7e 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk)
static int raw_release(struct socket *sock)
{
struct sock *sk = sock->sk;
- struct raw_sock *ro = raw_sk(sk);
+ struct raw_sock *ro;
+
+ if (!sk)
+ return 0;
+
+ ro = raw_sk(sk);
unregister_netdevice_notifier(&ro->notifier);