From dc240913458d591f59b52b3899d3fc3c5d6ec6ce Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 17 Oct 2018 12:32:54 -0700 Subject: src: Use memcpy() to handle potentially unaligned data Rolf Eike Beer reported that nft-expr_quota-test fails with a SIGBUS on SPARC due to unaligned accesses. This patch resolves that and fixes additional sources of unaligned accesses matching the same pattern. Both nft-expr_quota-test and nft-expr_objref-test generated unaligned accesses on DEC Alpha. Bug: https://bugs.gentoo.org/666448 Signed-off-by: Matt Turner Signed-off-by: Pablo Neira Ayuso --- src/obj/ct_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/obj/ct_helper.c') diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c index 5a689b1..d91f636 100644 --- a/src/obj/ct_helper.c +++ b/src/obj/ct_helper.c @@ -32,10 +32,10 @@ static int nftnl_obj_ct_helper_set(struct nftnl_obj *e, uint16_t type, snprintf(helper->name, sizeof(helper->name), "%s", (const char *)data); break; case NFTNL_OBJ_CT_HELPER_L3PROTO: - helper->l3proto = *((uint16_t *)data); + memcpy(&helper->l3proto, data, sizeof(helper->l3proto)); break; case NFTNL_OBJ_CT_HELPER_L4PROTO: - helper->l4proto = *((uint8_t *)data); + memcpy(&helper->l4proto, data, sizeof(helper->l4proto)); break; default: return -1; -- cgit v1.2.3