lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 12 Mar 2012 20:19:55 -0400 From: Paul Gortmaker <paul.gortmaker@...driver.com> To: stable@...nel.org, linux-kernel@...r.kernel.org Cc: stable-review@...nel.org, Dave Jones <davej@...hat.com>, "David S. Miller" <davem@...emloft.net>, Paul Gortmaker <paul.gortmaker@...driver.com> Subject: [34-longterm 082/196] can: Add missing socket check in can/bcm release. From: Dave Jones <davej@...hat.com> ------------------- This is a commit scheduled for the next v2.6.34 longterm release. If you see a problem with using this for longterm, please comment. ------------------- 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@...hat.com> Signed-off-by: David S. Miller <davem@...emloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.com> --- net/can/bcm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/can/bcm.c b/net/can/bcm.c index dd23fb1..a6445fd 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); -- 1.7.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists