diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2011-04-19 21:57:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-20 15:37:59 -0400 |
commit | 10022a6c66e199d8f61d9044543f38785713cbbd (patch) | |
tree | 8b934ebc8a5a5277a486413c343afc35a55076bd | |
parent | 2430af8b7fa37ac0be102c77f9dc6ee669d24ba9 (diff) |
can: add missing socket check in can/raw release
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>
-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 649acfa7c70a..0eb39a7fdf64 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk) | |||
305 | static int raw_release(struct socket *sock) | 305 | static int raw_release(struct socket *sock) |
306 | { | 306 | { |
307 | struct sock *sk = sock->sk; | 307 | struct sock *sk = sock->sk; |
308 | struct raw_sock *ro = raw_sk(sk); | 308 | struct raw_sock *ro; |
309 | |||
310 | if (!sk) | ||
311 | return 0; | ||
312 | |||
313 | ro = raw_sk(sk); | ||
309 | 314 | ||
310 | unregister_netdevice_notifier(&ro->notifier); | 315 | unregister_netdevice_notifier(&ro->notifier); |
311 | 316 | ||