From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 15 01:25:28 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 74E80E42;
 Fri, 15 Feb 2013 01:25:28 +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 66378905;
 Fri, 15 Feb 2013 01:25:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1PSb8039849;
 Fri, 15 Feb 2013 01:25:28 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1PSds039848;
 Fri, 15 Feb 2013 01:25:28 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201302150125.r1F1PSds039848@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 15 Feb 2013 01:25:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246815 -
 projects/diffused_head/sbin/ipfw/diffuse_exporter
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: Fri, 15 Feb 2013 01:25:28 -0000

Author: lstewart
Date: Fri Feb 15 01:25:27 2013
New Revision: 246815
URL: http://svnweb.freebsd.org/changeset/base/246815

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

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

Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c
==============================================================================
--- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c	Fri Feb 15 01:24:05 2013	(r246814)
+++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c	Fri Feb 15 01:25:27 2013	(r246815)
@@ -43,6 +43,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/endian.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/tree.h>
@@ -628,19 +629,17 @@ handle_anode_state_request(struct action
 
 		/* Add the IE data for the default flowrule template. */
 		for (i = 0; i < N_DEFAULT_FLOWRULE_TEMPLATE_ITEMS; i++) {
-			*((uint16_t *)(dstbuf + offs)) =
-			    htons(dip_info[def_flowrule_template[i]].id);
+			be16enc(dstbuf + offs,
+			    dip_info[def_flowrule_template[i]].id);
 			offs += sizeof(uint16_t);
 			if (def_flowrule_template[i] == DIP_IE_ACTION ||
 			    def_flowrule_template[i] == DIP_IE_EXPORT_NAME ||
 			    def_flowrule_template[i] == DIP_IE_CLASSIFIER_NAME) {
-				*((uint16_t *)(dstbuf + offs)) =
-				    htons((uint16_t)DI_MAX_NAME_STR_LEN);
+				be16enc(dstbuf + offs, DI_MAX_NAME_STR_LEN);
 				offs += sizeof(uint16_t);
 			} else if (def_flowrule_template[i] ==
 			    DIP_IE_ACTION_PARAMS) {
-				*((uint16_t *)(dstbuf + offs)) =
-				    htons((uint16_t)DI_MAX_PARAM_STR_LEN);
+				be16enc(dstbuf + offs, DI_MAX_PARAM_STR_LEN);
 				offs += sizeof(uint16_t);
 			}
 		}