Commit 29c486df authored Aug 30, 2011 by Eric Dumazet Committed by David S. Miller Aug 30, 2011

net: ipv4: relax AF_INET check in bind()

commit d0733d2e (Check for mistakenly passed in non-IPv4 address)
added regression on legacy apps that use bind() with AF_UNSPEC family.

Relax the check, but make sure the bind() is done on INADDR_ANY
addresses, as AF_UNSPEC has probably no sane meaning for other
addresses.

Bugzilla reference : https://bugzilla.kernel.org/show_bug.cgi?id=42012



Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Reported-and-bisected-by: Rene Meier <r_meier@freenet.de>
CC: Marcus Meissner <meissner@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 78582416

net/ipv4/af_inet.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -466,7 +466,12 @@ 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;
		if (addr->sin_family != AF_UNSPEC \|\|
		addr->sin_addr.s_addr != htonl(INADDR_ANY))
		goto out;
		}

Admin message