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

[Dann Frazier]

Author: dannf
Date: Wed May 15 01:45:02 2013
New Revision: 20094

Log:
iucv: Fix missing msg_namelen update in iucv_sock_recvmsg() (CVE-2013-3229)

Added:
   dists/wheezy-security/linux/debian/patches/bugfix/all/iucv-Fix-missing-msg_namelen-update-in-iucv_sock_rec.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:43:20 2013	(r20093)
+++ dists/wheezy-security/linux/debian/changelog	Wed May 15 01:45:02 2013	(r20094)
@@ -14,6 +14,7 @@
   * 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)
+  * iucv: Fix missing msg_namelen update in iucv_sock_recvmsg() (CVE-2013-3229)
 
  -- dann frazier <dannf at debian.org>  Tue, 14 May 2013 11:48:39 -0600
 

Added: dists/wheezy-security/linux/debian/patches/bugfix/all/iucv-Fix-missing-msg_namelen-update-in-iucv_sock_rec.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy-security/linux/debian/patches/bugfix/all/iucv-Fix-missing-msg_namelen-update-in-iucv_sock_rec.patch	Wed May 15 01:45:02 2013	(r20094)
@@ -0,0 +1,39 @@
+From 40c157ba78681c45cc62dabde406b44ca3c76c2b Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli at googlemail.com>
+Date: Sun, 7 Apr 2013 01:51:54 +0000
+Subject: [PATCH] iucv: Fix missing msg_namelen update in  iucv_sock_recvmsg()
+
+[ Upstream commit a5598bd9c087dc0efc250a5221e5d0e6f584ee88 ]
+
+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 iucv_sock_recvmsg() not filling the msg_name in case it was set.
+
+Cc: Ursula Braun <ursula.braun at de.ibm.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/iucv/af_iucv.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
+index cf98d62..e836140 100644
+--- a/net/iucv/af_iucv.c
++++ b/net/iucv/af_iucv.c
+@@ -1356,6 +1356,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+ 	int blen;
+ 	int err = 0;
+ 
++	msg->msg_namelen = 0;
++
+ 	if ((sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) &&
+ 	    skb_queue_empty(&iucv->backlog_skb_q) &&
+ 	    skb_queue_empty(&sk->sk_receive_queue) &&
+-- 
+1.7.10.4
+

Modified: dists/wheezy-security/linux/debian/patches/series
==============================================================================
--- dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:43:20 2013	(r20093)
+++ dists/wheezy-security/linux/debian/patches/series	Wed May 15 01:45:02 2013	(r20094)
@@ -652,3 +652,4 @@
 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
+bugfix/all/iucv-Fix-missing-msg_namelen-update-in-iucv_sock_rec.patch