Skip to contentSkip to conversation

can: add missing socket check in can/raw release.

PATCH Oliver Hartkopp 3 participants 3 messages Apr 20, 2011

Subsystems (3)
lore
Share & tools
lore

Oliver Hartkopp

author maintainer
#0 lore raw

We can get here with a NULL socket argument passed from userspace, so we need to handle it accordingly.

Thanks to Dave Jones pointing at this issue in net/can/bcm.c

---

net/can/raw.c +6 -1
index 649acfa..8f215e6 100644
@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk)
 static int raw_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct raw_sock *ro = raw_sk(sk);
+	struct raw_sock *ro;
+
+	if(!sk)
+		return 0;
+
+	ro = raw_sk(sk);
 
 	unregister_netdevice_notifier(&ro->notifier);
 
maintainer
#1 lore raw

From: Oliver Hartkopp <[email protected]>
Date: Wed, 20 Apr 2011 13:46:40 +0200

Quoted 6 lines

We can get here with a NULL socket argument passed from userspace, so we need to handle it accordingly.

Thanks to Dave Jones pointing at this issue in net/can/bcm.c

I already applied Dave's patch from last night.

#2 lore raw
Quoted 11 lines · David Miller

From: Oliver Hartkopp <[email protected]>
Date: Wed, 20 Apr 2011 13:46:40 +0200

Quoted 6 lines

We can get here with a NULL socket argument passed from userspace, so we need to handle it accordingly.

Thanks to Dave Jones pointing at this issue in net/can/bcm.c

I already applied Dave's patch from last night.

This is in a different path.

Dave