[kernel] r20091 - in dists/wheezy-security/linux/debian: . patches patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Wed May 15 01:32:14 2013
New Revision: 20091

Log:
Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()
(CVE-2013-3225)

Added:
   dists/wheezy-security/linux/debian/patches/bugfix/all/Bluetooth-RFCOMM-Fix-missing-msg_namelen-update-in-r.patch
Modified:
   dists/wheezy-security/linux/debian/changelog
   dists/wheezy-security/linux/debian/patches/series

Modified: dists/wheezy-security/linux/debian/changelog
==============================================================================
--- dists/wheezy-security/linux/debian/changelog	Wed May 15 01:22:52 2013	(r20090)
+++ dists/wheezy-security/linux/debian/changelog	Wed May 15 01:32:14 2013	(r20091)
@@ -9,6 +9,8 @@
   * atm: update msg_namelen in vcc_recvmsg() (CVE-2013-3222)
   * ax25: fix info leak via msg_name in ax25_recvmsg() (CVE-2013-3223)
   * Bluetooth: fix possible info leak in bt_sock_recvmsg() (CVE-2013-3224)
+  * Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()
+    (CVE-2013-3225)
 
  -- dann frazier <dannf at debian.org>  Tue, 14 May 2013 11:48:39 -0600
 

Added: dists/wheezy-security/linux/debian/patches/bugfix/all/Bluetooth-RFCOMM-Fix-missing-msg_namelen-update-in-r.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy-security/linux/debian/patches/bugfix/all/Bluetooth-RFCOMM-Fix-missing-msg_namelen-update-in-r.patch	Wed May 15 01:32:14 2013	(r20091)
@@ -0,0 +1,40 @@
+From bbad6f725f1d1b92e5eb3a7c6a8875eeec955747 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli at googlemail.com>
+Date: Sun, 7 Apr 2013 01:51:50 +0000
+Subject: [PATCH] Bluetooth: RFCOMM - Fix missing msg_namelen update in 
+ rfcomm_sock_recvmsg()
+
+[ Upstream commit e11e0455c0d7d3d62276a0c55d9dfbc16779d691 ]
+
+If RFCOMM_DEFER_SETUP is set in the flags, rfcomm_sock_recvmsg() returns
+early with 0 without updating the possibly set msg_namelen member. This,
+in turn, leads to a 128 byte kernel stack leak in net/socket.c.
+
+Fix this by updating msg_namelen in this case. For all other cases it
+will be handled in bt_sock_stream_recvmsg().
+
+Cc: Marcel Holtmann <marcel at holtmann.org>
+Cc: Gustavo Padovan <gustavo at padovan.org>
+Cc: Johan Hedberg <johan.hedberg at gmail.com>
+Signed-off-by: Mathias Krause <minipli at googlemail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ net/bluetooth/rfcomm/sock.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
+index 14c4864..82ce164 100644
+--- a/net/bluetooth/rfcomm/sock.c
++++ b/net/bluetooth/rfcomm/sock.c
+@@ -627,6 +627,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+ 
+ 	if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
+ 		rfcomm_dlc_accept(d);
++		msg->msg_namelen = 0;
+ 		return 0;
+ 	}
+ 
+-- 
+1.7.10.4
+

Modified: dists/wheezy-security/linux/debian/patches/series
==============================================================================
--- dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:22:52 2013	(r20090)
+++ dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:32:14 2013	(r20091)
@@ -649,3 +649,4 @@
 bugfix/all/atm-update-msg_namelen-in-vcc_recvmsg.patch
 bugfix/all/ax25-fix-info-leak-via-msg_name-in-ax25_recvmsg.patch
 bugfix/all/Bluetooth-fix-possible-info-leak-in-bt_sock_recvmsg.patch
+bugfix/all/Bluetooth-RFCOMM-Fix-missing-msg_namelen-update-in-r.patch