Date: Thu, 14 Nov 2013 08:34:40 +0200 From: Boris Astardzhiev <boris.astardzhiev@gmail.com> To: attilio@freebsd.org, freebsd-net@freebsd.org, freebsd-arm@freebsd.org Subject: NETDUMP ARM alignment fault fix Message-ID: <CAP=KkTwCcK9_QrCKw2Hog7WvL2J6LJvZFj=eNtESOvVPPwGKcw@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--047d7bf0c48cc552cd04eb1d4631
Content-Type: text/plain; charset=ISO-8859-1
Hi,
I've experienced some alignment faults using NETDUMP on the Sheevaplug ARM
board.
The function in question is netdump_send_arp(). I've attached a simple fix
to it and I'm posting it
as it might be of use to someone.
diff --git a/sys/netinet/netdump_client.c b/sys/netinet/netdump_client.c
index f6e5170..0379c61 100644
--- a/sys/netinet/netdump_client.c
+++ b/sys/netinet/netdump_client.c
@@ -510,9 +510,11 @@ netdump_send_arp()
ah->ar_pln = sizeof(struct in_addr);
ah->ar_op = htons(ARPOP_REQUEST);
memcpy(ar_sha(ah), IF_LLADDR(nd_nic), ETHER_ADDR_LEN);
- ((struct in_addr *)ar_spa(ah))->s_addr = nd_client.s_addr;
+ memcpy(&(((struct in_addr *)ar_spa(ah))->s_addr),
+ &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(&(((struct in_addr *)ar_tpa(ah))->s_addr), &nd_gw.s_addr,
+ sizeof(nd_gw.s_addr));
return netdump_ether_output(m, nd_nic, bcast, ETHERTYPE_ARP);
}
Greetings,
Boris
--047d7bf0c48cc552cd04eb1d4631
Content-Type: text/plain; charset=US-ASCII; name="armnetdumpalign.diff"
Content-Disposition: attachment; filename="armnetdumpalign.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_hnzmeefw0
ZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0L25ldGR1bXBfY2xpZW50LmMgYi9zeXMvbmV0aW5ldC9u
ZXRkdW1wX2NsaWVudC5jCmluZGV4IGY2ZTUxNzAuLjAzNzljNjEgMTAwNjQ0Ci0tLSBhL3N5cy9u
ZXRpbmV0L25ldGR1bXBfY2xpZW50LmMKKysrIGIvc3lzL25ldGluZXQvbmV0ZHVtcF9jbGllbnQu
YwpAQCAtNTEwLDkgKzUxMCwxMSBAQCBuZXRkdW1wX3NlbmRfYXJwKCkKIAlhaC0+YXJfcGxuID0g
c2l6ZW9mKHN0cnVjdCBpbl9hZGRyKTsKIAlhaC0+YXJfb3AgPSBodG9ucyhBUlBPUF9SRVFVRVNU
KTsKIAltZW1jcHkoYXJfc2hhKGFoKSwgSUZfTExBRERSKG5kX25pYyksIEVUSEVSX0FERFJfTEVO
KTsKLQkoKHN0cnVjdCBpbl9hZGRyICopYXJfc3BhKGFoKSktPnNfYWRkciA9IG5kX2NsaWVudC5z
X2FkZHI7CisJbWVtY3B5KCYoKChzdHJ1Y3QgaW5fYWRkciAqKWFyX3NwYShhaCkpLT5zX2FkZHIp
LAorCSAgICAmbmRfY2xpZW50LnNfYWRkciwgc2l6ZW9mKG5kX2NsaWVudC5zX2FkZHIpKTsKIAli
emVybyhhcl90aGEoYWgpLCBFVEhFUl9BRERSX0xFTik7Ci0JKChzdHJ1Y3QgaW5fYWRkciAqKWFy
X3RwYShhaCkpLT5zX2FkZHIgPSBuZF9ndy5zX2FkZHI7CisJbWVtY3B5KCYoKChzdHJ1Y3QgaW5f
YWRkciAqKWFyX3RwYShhaCkpLT5zX2FkZHIpLCAmbmRfZ3cuc19hZGRyLAorCSAgICBzaXplb2Yo
bmRfZ3cuc19hZGRyKSk7CiAKIAlyZXR1cm4gbmV0ZHVtcF9ldGhlcl9vdXRwdXQobSwgbmRfbmlj
LCBiY2FzdCwgRVRIRVJUWVBFX0FSUCk7CiB9Cg==
--047d7bf0c48cc552cd04eb1d4631--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP=KkTwCcK9_QrCKw2Hog7WvL2J6LJvZFj=eNtESOvVPPwGKcw>