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:55:00 -0700 |
| commit | d459e08d10e2a6c5e3556bdd8fc7fb3b0d20644e (patch) | |
| tree | 32b2b57fb56877738a5f0ea220366aa7986eb95b | |
| parent | 1c89151b1c02cfd10d09350e5d49aef9708836cd (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>
| -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 029dcc2b323..2ffd2e01dc5 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1425,9 +1425,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); |