[kernel/f18] CVE-2013-3231 llc: Fix missing msg_namelen update in llc_ui_recvmsg (rhbz 956094 956104)

[Josh Boyer]

commit c416a99578ae1154e92c589ca49ca37e83427602
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Apr 24 08:50:02 2013 -0400

    CVE-2013-3231 llc: Fix missing msg_namelen update in llc_ui_recvmsg (rhbz 956094 956104)

 kernel.spec                                        |    7 ++++
 ...sing-msg_namelen-update-in-llc_ui_recvmsg.patch |   37 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 7622f70..a3e1d2d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -826,6 +826,9 @@ Patch25021: NFC-llcp-fix-info-leaks-via-msg_name-in-llcp_sock_re.patch
 #CVE-2013-3232 956110 956113
 Patch25022: netrom-fix-invalid-use-of-sizeof-in-nr_recvmsg.patch
 
+#CVE-2013-3231 956094 956104
+Patch25023: llc-Fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1602,6 +1605,9 @@ ApplyPatch NFC-llcp-fix-info-leaks-via-msg_name-in-llcp_sock_re.patch
 #CVE-2013-3232 956110 956113
 ApplyPatch netrom-fix-invalid-use-of-sizeof-in-nr_recvmsg.patch
 
+#CVE-2013-3231 956094 956104
+ApplyPatch llc-Fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2460,6 +2466,7 @@ fi
 #                 ||     ||
 %changelog
 * Wed Apr 24 2013 Josh Boyer <jwboyer at redhat.com>
+- CVE-2013-3231 llc: Fix missing msg_namelen update in llc_ui_recvmsg (rhbz 956094 956104)
 - CVE-2013-3232 netrom: information leak via msg_name in nr_recvmsg (rhbz 956110 956113)
 - CVE-2013-3233 NFC: llcp: info leaks via msg_name in llcp_sock_recvmsg (rhbz 956125 956129)
 - CVE-2013-3234 rose: info leak via msg_name in rose_recvmsg (rhbz 956135 956139)
diff --git a/llc-Fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch b/llc-Fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch
new file mode 100644
index 0000000..ef123b0
--- /dev/null
+++ b/llc-Fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch
@@ -0,0 +1,37 @@
+From c77a4b9cffb6215a15196ec499490d116dfad181 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli at googlemail.com>
+Date: Sun, 7 Apr 2013 01:51:56 +0000
+Subject: [PATCH] llc: Fix missing msg_namelen update in llc_ui_recvmsg()
+
+For stream sockets the code misses to update 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. The msg_namelen update is also missing for datagram sockets
+in case the socket is shutting down during receive.
+
+Fix both issues by setting msg_namelen to 0 early. It will be
+updated later if we're going to fill the msg_name member.
+
+Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
+Signed-off-by: Mathias Krause <minipli at googlemail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/llc/af_llc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
+index 8870988..48aaa89 100644
+--- a/net/llc/af_llc.c
++++ b/net/llc/af_llc.c
+@@ -720,6 +720,8 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
+ 	int target;	/* Read at least this many bytes */
+ 	long timeo;
+ 
++	msg->msg_namelen = 0;
++
+ 	lock_sock(sk);
+ 	copied = -ENOTCONN;
+ 	if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN))
+-- 
+1.8.1.4
+