Skip to content

Commit

Permalink
can: add missing socket check in can/raw release
Browse files Browse the repository at this point in the history
commit 10022a6 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>
  • Loading branch information
Oliver Hartkopp authored and Greg Kroah-Hartman committed May 9, 2011
1 parent 8fac1f0 commit 8bd2617
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion net/can/raw.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 8bd2617

Please sign in to comment.