diff options
| author | Dave Jones <davej@redhat.com> | 2011-04-19 20:36:59 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 10:57:20 -0400 |
| commit | 2aaab289c94b23f7275e9bb38a927483ff9b1760 (patch) | |
| tree | 9d778ec31b0881d99ba95a06526d77dc6f257b4d /net | |
| parent | dfde8c905e97a9332f87479b0cec3323e4eda71e (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: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
| -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 dd23fb1ec5c8..a6445fd07f2b 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1426,9 +1426,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); |