svn commit: r228062 - head/sys/netinet

[Gleb Smirnoff]

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;