[kernel] r17199 - in dists/lenny-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Apr  4 02:33:48 2011
New Revision: 17199

Log:
netfilter: ip_tables: fix infoleak to userspace (CVE-2011-1171)

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch
      - copied unchanged from r17187, dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch
Modified:
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/26lenny3

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Mon Apr  4 02:31:16 2011	(r17198)
+++ dists/lenny-security/linux-2.6/debian/changelog	Mon Apr  4 02:33:48 2011	(r17199)
@@ -14,6 +14,7 @@
   * dccp: fix oops on Reset after close (CVE-2011-1093)
   * Fix corrupted OSF partition table parsing (CVE-2011-1163)
   * netfilter: arp_tables: fix infoleak to userspace (CVE-2011-1170)
+  * netfilter: ip_tables: fix infoleak to userspace (CVE-2011-1171)
 
  -- dann frazier <dannf at debian.org>  Wed, 30 Mar 2011 22:46:26 -0600
 

Copied: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch (from r17187, dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch	Mon Apr  4 02:33:48 2011	(r17199, copy of r17187, dists/squeeze/linux-2.6/debian/patches/bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch)
@@ -0,0 +1,48 @@
+commit 78b79876761b86653df89c48a7010b5cbd41a84a
+Author: Vasiliy Kulikov <segoon at openwall.com>
+Date:   Tue Mar 15 13:36:05 2011 +0100
+
+    netfilter: ip_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 and the third bugs were introduced before the git epoch; the
+    second was introduced in 2722971c (v2.6.17-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/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
+index ef7d7b9..b09ed0d 100644
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -1262,6 +1262,7 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
+ 	/* 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)
+@@ -1807,6 +1808,7 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)
+ 		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)
+@@ -2036,6 +2038,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+ 			ret = -EFAULT;
+ 			break;
+ 		}
++		rev.name[sizeof(rev.name)-1] = 0;
+ 
+ 		if (cmd == IPT_SO_GET_REVISION_TARGET)
+ 			target = 1;

Modified: dists/lenny-security/linux-2.6/debian/patches/series/26lenny3
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/26lenny3	Mon Apr  4 02:31:16 2011	(r17198)
+++ dists/lenny-security/linux-2.6/debian/patches/series/26lenny3	Mon Apr  4 02:33:48 2011	(r17199)
@@ -13,3 +13,4 @@
 + bugfix/all/fix-corrupted-osf-partition-parsing.patch
 + bugfix/all/increase-osf-partition-limit-from-8-to-18.patch
 + bugfix/all/netfilter-arp_tables-fix-infoleak-to-userspace.patch
++ bugfix/all/netfilter-ip_tables-fix-infoleak-to-userspace.patch