diff options
| author | Dave Jones <davej@redhat.com> | 2011-04-19 20:36:59 -0700 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-08-01 13:54:44 -0700 |
| commit | 25b405bacb846370a9af427662594eabfb72803b (patch) | |
| tree | 95248e278fd631927c38120811b02c91fea11f1c /net | |
| parent | 18c76472ce00748c2d53ff46f3a70537b632f304 (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>
Signed-off-by: Andi Kleen <ak@linux.intel.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 9d5e8accfab1..56d20a29a7e9 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1424,9 +1424,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); |