[kernel] r17290 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Tue May  3 05:58:40 2011
New Revision: 17290

Log:
can: Add missing socket check in can/raw release (CVE-2011-1748)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/can-add-missing-socket-check-in-can+raw-release.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/34

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue May  3 05:58:33 2011	(r17289)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue May  3 05:58:40 2011	(r17290)
@@ -68,6 +68,7 @@
     (CVE-2011-1017)
   * mpt2sas: prevent heap overflows and unchecked reads (CVE-2011-1494)
   * can: Add missing socket check in can/bcm release (CVE-2011-1598)
+  * can: Add missing socket check in can/raw release (CVE-2011-1748)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Apr 2011 01:13:01 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/can-add-missing-socket-check-in-can+raw-release.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/can-add-missing-socket-check-in-can+raw-release.patch	Tue May  3 05:58:40 2011	(r17290)
@@ -0,0 +1,34 @@
+commit 10022a6c66e199d8f61d9044543f38785713cbbd
+Author: Oliver Hartkopp <socketcan at hartkopp.net>
+Date:   Wed Apr 20 01:57:15 2011 +0000
+
+    can: add missing socket check in can/raw release
+    
+    v2: added space after 'if' according code style.
+    
+    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
+    
+    Signed-off-by: Oliver Hartkopp <socketcan at hartkopp.net>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/can/raw.c b/net/can/raw.c
+index 649acfa..0eb39a7 100644
+--- a/net/can/raw.c
++++ b/net/can/raw.c
+@@ -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);
+ 

Modified: dists/squeeze/linux-2.6/debian/patches/series/34
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/34	Tue May  3 05:58:33 2011	(r17289)
+++ dists/squeeze/linux-2.6/debian/patches/series/34	Tue May  3 05:58:40 2011	(r17290)
@@ -44,3 +44,4 @@
 + bugfix/all/partitions-ldm-fix-oops-caused-by-corrupted-partition-table.patch
 + bugfix/all/mpt2sas-prevent-heap-overflows-and-unchecked-reads.patch
 + bugfix/all/can-add-missing-socket-check-in-can+bcm-release.patch
++ bugfix/all/can-add-missing-socket-check-in-can+raw-release.patch