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

[Dann Frazier]

Author: dannf
Date: Wed May 15 01:43:20 2013
New Revision: 20093

Log:
irda: Fix missing msg_namelen update in irda_recvmsg_dgram() (CVE-2013-3228)

Added:
   dists/wheezy-security/linux/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.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:36:39 2013	(r20092)
+++ dists/wheezy-security/linux/debian/changelog	Wed May 15 01:43:20 2013	(r20093)
@@ -13,6 +13,7 @@
     (CVE-2013-3225)
   * caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg()
     (CVE-2013-3227)
+  * irda: Fix missing msg_namelen update in irda_recvmsg_dgram() (CVE-2013-3228)
 
  -- dann frazier <dannf at debian.org>  Tue, 14 May 2013 11:48:39 -0600
 

Added: dists/wheezy-security/linux/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy-security/linux/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch	Wed May 15 01:43:20 2013	(r20093)
@@ -0,0 +1,41 @@
+From 402fb9f974f158d747e6c6944336cd9af7f349b2 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli at googlemail.com>
+Date: Sun, 7 Apr 2013 01:51:53 +0000
+Subject: [PATCH] irda: Fix missing msg_namelen update in 
+ irda_recvmsg_dgram()
+
+[ Upstream commit 5ae94c0d2f0bed41d6718be743985d61b7f5c47d ]
+
+The current code does not fill the msg_name member in case it is set.
+It also does not set the msg_namelen member to 0 and therefore makes
+net/socket.c leak the local, uninitialized sockaddr_storage variable
+to userland -- 128 bytes of kernel stack memory.
+
+Fix that by simply setting msg_namelen to 0 as obviously nobody cared
+about irda_recvmsg_dgram() not filling the msg_name in case it was
+set.
+
+Cc: Samuel Ortiz <samuel at sortiz.org>
+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/irda/af_irda.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
+index f4b49c5..91821e9 100644
+--- a/net/irda/af_irda.c
++++ b/net/irda/af_irda.c
+@@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,
+ 
+ 	IRDA_DEBUG(4, "%s()\n", __func__);
+ 
++	msg->msg_namelen = 0;
++
+ 	skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
+ 				flags & MSG_DONTWAIT, &err);
+ 	if (!skb)
+-- 
+1.7.10.4
+

Modified: dists/wheezy-security/linux/debian/patches/series
==============================================================================
--- dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:36:39 2013	(r20092)
+++ dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:43:20 2013	(r20093)
@@ -651,3 +651,4 @@
 bugfix/all/Bluetooth-fix-possible-info-leak-in-bt_sock_recvmsg.patch
 bugfix/all/Bluetooth-RFCOMM-Fix-missing-msg_namelen-update-in-r.patch
 bugfix/all/caif-Fix-missing-msg_namelen-update-in-caif_seqpkt_r.patch
+bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch