diff options
| author | Dave Jones <davej@redhat.com> | 2011-04-19 20:36:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-09 15:06:48 -0700 |
| commit | ba1ba1c0aaa659914bf9d47616453f6378add40f (patch) | |
| tree | f1e402bb452053e240a05b6e888f512ea06d93b3 /net/can | |
| parent | 6f0a6240e8ce1659574e944eac04e871a9dc1fe7 (diff) | |
can: Add missing socket check in can/bcm release.
commit c6914a6f261aca0c9f715f883a353ae7ff51fe83 upstream.
We can get here with a NULL socket argument passed from userspace,
so we need to handle it accordingly.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/bcm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 092dc88a7c6..63779ab2b75 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1427,9 +1427,14 @@ static int bcm_init(struct sock *sk) static int bcm_release(struct socket *sock) { struct sock *sk = sock->sk; - struct bcm_sock *bo = bcm_sk(sk); + struct bcm_sock *bo; struct bcm_op *op, *next; + if (sk == NULL) + return 0; + + bo = bcm_sk(sk); + /* remove bcm_ops, timer, rx_unregister(), etc. */ unregister_netdevice_notifier(&bo->notifier); |