diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2011-04-20 01:57:15 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-09 16:04:47 -0700 |
| commit | 19ad77be55e04722f4879bf41773b5b1d0d07510 (patch) | |
| tree | 19856a0d7f7274e1c547a46fc8fd29a7d469cba3 | |
| parent | a482cd7db9a4067c9bcfcaf832e9bffcf27e3def (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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index abca920440b5..502368c34713 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -280,7 +280,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); |