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

[Dann Frazier]

Author: dannf
Date: Sun Mar 27 22:46:01 2011
New Revision: 17133

Log:
netfilter: arp_tables: fix infoleak to userspace (CVE-2011-1170)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-arp_tables-fix-infoleak-to-userspace.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Mar 27 22:42:10 2011	(r17132)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Mar 27 22:46:01 2011	(r17133)
@@ -53,6 +53,7 @@
   * bridge: netfilter: fix information leak (CVE-2011-1080)
   * nfs4: Ensure that ACL pages sent over NFS were not allocated from the slab
     (CVE-2011-1090)
+  * netfilter: arp_tables: fix infoleak to userspace (CVE-2011-1170)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 12 Mar 2011 20:20:58 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-arp_tables-fix-infoleak-to-userspace.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-arp_tables-fix-infoleak-to-userspace.patch	Sun Mar 27 22:46:01 2011	(r17133)
@@ -0,0 +1,49 @@
+commit 42eab94fff18cb1091d3501cd284d6bd6cc9c143
+Author: Vasiliy Kulikov <segoon at openwall.com>
+Date:   Tue Mar 15 13:35:21 2011 +0100
+
+    netfilter: arp_tables: fix infoleak to userspace
+    
+    Structures ipt_replace, compat_ipt_replace, and xt_get_revision are
+    copied from userspace.  Fields of these structs that are
+    zero-terminated strings are not checked.  When they are used as argument
+    to a format string containing "%s" in request_module(), some sensitive
+    information is leaked to userspace via argument of spawned modprobe
+    process.
+    
+    The first bug was introduced before the git epoch;  the second is
+    introduced by 6b7d31fc (v2.6.15-rc1);  the third is introduced by
+    6b7d31fc (v2.6.15-rc1).  To trigger the bug one should have
+    CAP_NET_ADMIN.
+    
+    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
+    Signed-off-by: Patrick McHardy <kaber at trash.net>
+
+diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
+index e95054c..4b5d457 100644
+--- a/net/ipv4/netfilter/arp_tables.c
++++ b/net/ipv4/netfilter/arp_tables.c
+@@ -1066,6 +1066,7 @@ static int do_replace(struct net *net, const void __user *user,
+ 	/* overflow check */
+ 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
+ 		return -ENOMEM;
++	tmp.name[sizeof(tmp.name)-1] = 0;
+ 
+ 	newinfo = xt_alloc_table_info(tmp.size);
+ 	if (!newinfo)
+@@ -1488,6 +1489,7 @@ static int compat_do_replace(struct net *net, void __user *user,
+ 		return -ENOMEM;
+ 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
+ 		return -ENOMEM;
++	tmp.name[sizeof(tmp.name)-1] = 0;
+ 
+ 	newinfo = xt_alloc_table_info(tmp.size);
+ 	if (!newinfo)
+@@ -1740,6 +1742,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
+ 			ret = -EFAULT;
+ 			break;
+ 		}
++		rev.name[sizeof(rev.name)-1] = 0;
+ 
+ 		try_then_request_module(xt_find_revision(NFPROTO_ARP, rev.name,
+ 							 rev.revision, 1, &ret),

Modified: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32	Sun Mar 27 22:42:10 2011	(r17132)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Sun Mar 27 22:46:01 2011	(r17133)
@@ -20,3 +20,4 @@
 + bugfix/all/bridge-netfilter-fix-information-leak.patch
 + bugfix/all/nfs4-ensure-that-acl-pages-sent-over-nfs-were-not-allocated-from-the-slab.patch
 + bugfix/all/nfs4-ensure-that-acl-pages-sent-over-nfs-were-not-allocated-from-the-slab-compilation-warning.patch
++ bugfix/all/netfilter-arp_tables-fix-infoleak-to-userspace.patch