[kernel] r18023 - in dists/squeeze/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Sat Aug 27 14:17:48 2011
New Revision: 18023

Log:
Revert "net/ipv4: Check for mistakenly passed in non-IPv4 address"

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/revert-net-ipv4-Check-for-mistakenly-passed-in-non-I.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Aug 27 13:36:45 2011	(r18022)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Aug 27 14:17:48 2011	(r18023)
@@ -64,6 +64,8 @@
     - Add support for BCM50610M and BCM5241 PHYs
     - Fix support for BCM5755
   * Remove net device features from bug reports (Closes: #638956)
+  * Revert "net/ipv4: Check for mistakenly passed in non-IPv4 address"
+    included in 2.6.32.43, which might break some applications
   * Add longterm release 2.6.32.44, including:
     - NFSv4.1: update nfs4_fattr_bitmap_maxsz
     - hwmon: (max1111) Fix race condition causing NULL pointer exception

Added: dists/squeeze/linux-2.6/debian/patches/debian/revert-net-ipv4-Check-for-mistakenly-passed-in-non-I.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/revert-net-ipv4-Check-for-mistakenly-passed-in-non-I.patch	Sat Aug 27 14:17:48 2011	(r18023)
@@ -0,0 +1,30 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 27 Aug 2011 15:09:53 +0100
+Subject: [PATCH] Revert "net/ipv4: Check for mistakenly passed in non-IPv4
+ address"
+
+This reverts commit d0733d2e29b652b2e7b1438ececa732e4eed98eb,
+cherry-picked in 2.6.32.43.  I suspect that some applications
+accidentally depend on the old behaviour, and we don't want to break
+them in a stable update.
+---
+ net/ipv4/af_inet.c |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
+index a289878..57737b8 100644
+--- a/net/ipv4/af_inet.c
++++ b/net/ipv4/af_inet.c
+@@ -460,9 +460,6 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+ 	if (addr_len < sizeof(struct sockaddr_in))
+ 		goto out;
+ 
+-	if (addr->sin_family != AF_INET)
+-		goto out;
+-
+ 	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
+ 
+ 	/* Not specified by any standard per-se, however it breaks too
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sat Aug 27 13:36:45 2011	(r18022)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sat Aug 27 14:17:48 2011	(r18023)
@@ -21,6 +21,7 @@
 + bugfix/all/stable/2.6.32.43.patch
 + debian/if_packet-avoid-ABI-change-in-2.6.32.43.patch
 + debian/mm-avoid-ABI-change-in-2.6.32.43.patch
++ debian/revert-net-ipv4-Check-for-mistakenly-passed-in-non-I.patch
 
 # Networking
 + features/all/net-Add-netdev_alloc_skb_ip_align-helper.patch