]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
can: add missing socket check in can/raw release
authorOliver Hartkopp <socketcan@hartkopp.net>
Wed, 20 Apr 2011 01:57:15 +0000 (01:57 +0000)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Wed, 14 Mar 2012 14:57:20 +0000 (10:57 -0400)
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
net/can/raw.c

index da99cf153b33737ce45a06e71fc89037b96096b3..9dd45ea45ccb717342a3aae691f2a38540a2f165 100644 (file)
@@ -281,7 +281,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);