From owner-svn-src-projects@FreeBSD.ORG  Thu Jan 17 08:35:41 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C912B7F5;
 Thu, 17 Jan 2013 08:35:41 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BBF1BC3D;
 Thu, 17 Jan 2013 08:35:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0H8ZfDj067186;
 Thu, 17 Jan 2013 08:35:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0H8ZfCD067185;
 Thu, 17 Jan 2013 08:35:41 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201301170835.r0H8ZfCD067185@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 17 Jan 2013 08:35:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245543 -
 projects/diffused_head/sbin/ipfw/diffuse_collector
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2013 08:35:41 -0000

Author: lstewart
Date: Thu Jan 17 08:35:41 2013
New Revision: 245543
URL: http://svnweb.freebsd.org/changeset/base/245543

Log:
  Mitigate against possible unaligned access when serialising data into a buffer.
  
  Reported by:	clang

Modified:
  projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c

Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c
==============================================================================
--- projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Thu Jan 17 07:04:37 2013	(r245542)
+++ projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Thu Jan 17 08:35:41 2013	(r245543)
@@ -1894,8 +1894,7 @@ request_classifier_state()
 	thdr->flags = 0;
 	offs += sizeof(struct dip_templ_header);
 
-	*((uint16_t *)(reqstatepkt + offs)) =
-	    htons(dip_info[DIP_IE_MSG_TYPE].id);
+	be16enc(reqstatepkt + offs, htons(dip_info[DIP_IE_MSG_TYPE].id));
 	offs += sizeof(uint16_t);
 	shdr->set_len = htons(offs - sizeof(struct dip_header));