From owner-svn-src-head@FreeBSD.ORG  Mon Nov 28 13:30:15 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11E2C106564A;
	Mon, 28 Nov 2011 13:30:14 +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 BC9988FC08;
	Mon, 28 Nov 2011 13:30:14 +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 pASDUE6S092876;
	Mon, 28 Nov 2011 13:30:14 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASDUEBD092874;
	Mon, 28 Nov 2011 13:30:14 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201111281330.pASDUEBD092874@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 28 Nov 2011 13:30:14 +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: r228062 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 13:30:15 -0000

Author: glebius
Date: Mon Nov 28 13:30:14 2011
New Revision: 228062
URL: http://svn.freebsd.org/changeset/base/228062

Log:
  Fix one more fallout from r227791: do not overwrite trimmed sa_len
  on the ia_sockmask when doing SIOCSIFNETMASK.
  
  Reported by:	Stefan Bethke <stb lassitu.de>, gonzo
  Pointy hat to:	glebius

Modified:
  head/sys/netinet/in.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Mon Nov 28 12:38:24 2011	(r228061)
+++ head/sys/netinet/in.c	Mon Nov 28 13:30:14 2011	(r228062)
@@ -533,7 +533,8 @@ in_control(struct socket *so, u_long cmd
 		goto out;
 
 	case SIOCSIFNETMASK:
-		ia->ia_sockmask = *(struct sockaddr_in *)&ifr->ifr_addr;
+		ia->ia_sockmask.sin_addr = ((struct sockaddr_in *)
+		    &ifr->ifr_addr)->sin_addr;
 		ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr);
 		goto out;