From owner-svn-src-all@FreeBSD.ORG  Fri Dec 16 13:30:17 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC0B8106566C;
	Fri, 16 Dec 2011 13:30:17 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AA6D88FC14;
	Fri, 16 Dec 2011 13:30:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBGDUHA6008719;
	Fri, 16 Dec 2011 13:30:17 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBGDUH5W008716;
	Fri, 16 Dec 2011 13:30:17 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201112161330.pBGDUH5W008716@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 16 Dec 2011 13:30:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228574 - in head: sbin/ifconfig sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Dec 2011 13:30:17 -0000

Author: glebius
Date: Fri Dec 16 13:30:17 2011
New Revision: 228574
URL: http://svn.freebsd.org/changeset/base/228574

Log:
  Since size of struct in_aliasreq has just been changed in r228571,
  and thus ifconfig(8) needs recompile, it is a good chance to make
  parameter checks on SIOCAIFADDR arguments more strict.

Modified:
  head/sbin/ifconfig/af_inet.c
  head/sys/netinet/in.c

Modified: head/sbin/ifconfig/af_inet.c
==============================================================================
--- head/sbin/ifconfig/af_inet.c	Fri Dec 16 12:53:15 2011	(r228573)
+++ head/sbin/ifconfig/af_inet.c	Fri Dec 16 13:30:17 2011	(r228574)
@@ -126,6 +126,7 @@ in_getaddr(const char *s, int which)
 				*p = '/';
 				errx(1, "%s: bad value (width %s)", s, errstr);
 			}
+			min->sin_family = AF_INET;
 			min->sin_len = sizeof(*min);
 			min->sin_addr.s_addr = htonl(~((1LL << (32 - masklen)) - 1) & 
 				              0xffffffff);

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Fri Dec 16 12:53:15 2011	(r228573)
+++ head/sys/netinet/in.c	Fri Dec 16 13:30:17 2011	(r228574)
@@ -253,16 +253,10 @@ in_control(struct socket *so, u_long cmd
 		    sizeof(struct sockaddr_in) ||
 		    ifra->ifra_broadaddr.sin_family != AF_INET))
 			return (EINVAL);
-#if 0
-		/*
-		 * ifconfig(8) historically doesn't set af_family for mask
-		 * for unknown reason.
-		 */
 		if (ifra->ifra_mask.sin_len != 0 &&
 		    (ifra->ifra_mask.sin_len != sizeof(struct sockaddr_in) ||
 		    ifra->ifra_mask.sin_family != AF_INET))
 			return (EINVAL);
-#endif
 		break;
 	case SIOCSIFADDR:
 	case SIOCSIFBRDADDR: