From owner-svn-src-projects@FreeBSD.ORG Fri Nov 22 21:21:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC3CB97A; Fri, 22 Nov 2013 21:21:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC2232F11; Fri, 22 Nov 2013 21:21:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMLLu10057471; Fri, 22 Nov 2013 21:21:56 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMLLu05057470; Fri, 22 Nov 2013 21:21:56 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201311222121.rAMLLu05057470@svn.freebsd.org> From: Ed Maste Date: Fri, 22 Nov 2013 21:21:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258488 - projects/sv/sys/netinet 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.16 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, 22 Nov 2013 21:21:56 -0000 Author: emaste Date: Fri Nov 22 21:21:56 2013 New Revision: 258488 URL: http://svnweb.freebsd.org/changeset/base/258488 Log: Avoid alignment faults on ARM in netdump's ARP function Based on a patch submitted by Boris Astardzhiev. Sponsored by: The FreeBSD Foundation Modified: projects/sv/sys/netinet/netdump_client.c Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Fri Nov 22 21:20:16 2013 (r258487) +++ projects/sv/sys/netinet/netdump_client.c Fri Nov 22 21:21:56 2013 (r258488) @@ -421,9 +421,9 @@ netdump_send_arp() ah->ar_pln = sizeof(struct in_addr); ah->ar_op = htons(ARPOP_REQUEST); memcpy(ar_sha(ah), IF_LLADDR(nd_ifp), ETHER_ADDR_LEN); - ((struct in_addr *)ar_spa(ah))->s_addr = nd_client.s_addr; + memcpy(ar_spa(ah), &nd_client.s_addr, sizeof(nd_client.s_addr)); bzero(ar_tha(ah), ETHER_ADDR_LEN); - ((struct in_addr *)ar_tpa(ah))->s_addr = nd_gw.s_addr; + memcpy(ar_tpa(ah), &nd_gw.s_addr, sizeof(nd_gw.s_addr)); return (netdump_ether_output(m, nd_ifp, bcast, ETHERTYPE_ARP)); }