From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 00:54:33 2013 Return-Path: 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 CED8B631; Fri, 15 Feb 2013 00:54:33 +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 A65B3829; Fri, 15 Feb 2013 00:54:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F0sXpM030291; Fri, 15 Feb 2013 00:54:33 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F0sX74030290; Fri, 15 Feb 2013 00:54:33 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150054.r1F0sX74030290@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 00:54:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246810 - projects/diffused_head/sbin/ipfw 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2013 00:54:33 -0000 Author: lstewart Date: Fri Feb 15 00:54:33 2013 New Revision: 246810 URL: http://svnweb.freebsd.org/changeset/base/246810 Log: Mitigate against possible unaligned access when parsing protocol data. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_proto.c Thu Feb 14 21:29:55 2013 (r246809) +++ projects/diffused_head/sbin/ipfw/diffuse_proto.c Fri Feb 15 00:54:33 2013 (r246810) @@ -38,6 +38,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include @@ -73,7 +74,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_DST_IPV4: { /* XXX: Resolve to name. */ - a.s_addr = *((uint32_t *)val); + a.s_addr = le32dec(val); /* le32dec to leave as BE. */ printf("%s", inet_ntoa(a)); break; } @@ -81,7 +82,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_SRC_PORT: case DIP_IE_DST_PORT: /* XXX: Resolve to name. */ - printf("%u", ntohs(*((uint16_t *)val))); + printf("%u", be16dec(val)); break; case DIP_IE_PROTO: @@ -89,13 +90,13 @@ print_field(int idx, int id, int len, ch case DIP_IE_TIMEOUT_TYPE: case DIP_IE_IPV4_TOS: /* XXX: Resolve to name. */ - printf("%u", *((uint8_t *)val)); + printf("%u", *val); break; case DIP_IE_CLASS_LABEL: case DIP_IE_ACTION_FLAGS: case DIP_IE_TIMEOUT: - printf("%u", ntohs(*((uint16_t *)val))); + printf("%u", be16dec(val)); break; case DIP_IE_ACTION: @@ -107,7 +108,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_PCKT_CNT: case DIP_IE_KBYTE_CNT: - printf("%u", ntohl(*((uint32_t *)val))); + printf("%u", be32dec(val)); break; case DIP_IE_CLASSES: @@ -116,7 +117,7 @@ print_field(int idx, int id, int len, ch while (c < val + len) { printf("%s:", c); c += strlen(val) + 1; - printf("%u", ntohs(*((uint16_t *)c))); + printf("%u", be16dec(c)); c += sizeof(uint16_t); if (c < val + len) printf(" "); @@ -199,7 +200,7 @@ diffuse_proto_print_msg(char *buf, struc sizeof(struct dip_set_header) - sizeof(struct dip_templ_header)) { r->fields[r->fcnt].id = - ntohs(*((uint16_t *)(buf + offs))); + be16dec(buf + offs); offs += sizeof(uint16_t); info = diffuse_proto_get_info( r->fields[r->fcnt].id); @@ -207,8 +208,7 @@ diffuse_proto_print_msg(char *buf, struc r->fields[r->fcnt].len = info.len; if (r->fields[r->fcnt].len == 0) { r->fields[r->fcnt].len = - ntohs(*((uint16_t *) - (buf + offs))); + be16dec(buf + offs); offs += sizeof(uint16_t); } r->fcnt++;