From 45bc9a62b7cb15fc4e2769397cdf1dee7e3999c0 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 30 Aug 2011 18:57:00 -0400
Subject: [PATCH] --- yaml --- r: 263933 b: refs/heads/master c:
 29c486df6a208432b370bd4be99ae1369ede28d8 h: refs/heads/master i:   263931:
 0244a71cd7c70c918c37a4395a298261ffa0723e v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/af_inet.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 618787f87fa0..584fc5778e7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 785824165508a65478474f0c87f6b8c3ad048c62
+refs/heads/master: 29c486df6a208432b370bd4be99ae1369ede28d8
diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index 1b745d412cf6..dd2b9478ddd1 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/net/ipv4/af_inet.c
@@ -466,8 +466,13 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 		goto out;
 
 	if (addr->sin_family != AF_INET) {
+		/* Compatibility games : accept AF_UNSPEC (mapped to AF_INET)
+		 * only if s_addr is INADDR_ANY.
+		 */
 		err = -EAFNOSUPPORT;
-		goto out;
+		if (addr->sin_family != AF_UNSPEC ||
+		    addr->sin_addr.s_addr != htonl(INADDR_ANY))
+			goto out;
 	}
 
 	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);