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_timeout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/obj/ct_timeout.c') diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c index 12c8f5f..e2e9991 100644 --- a/src/obj/ct_timeout.c +++ b/src/obj/ct_timeout.c @@ -148,10 +148,10 @@ static int nftnl_obj_ct_timeout_set(struct nftnl_obj *e, uint16_t type, switch (type) { case NFTNL_OBJ_CT_TIMEOUT_L3PROTO: - timeout->l3proto = *((uint16_t *)data); + memcpy(&timeout->l3proto, data, sizeof(timeout->l3proto)); break; case NFTNL_OBJ_CT_TIMEOUT_L4PROTO: - timeout->l4proto = *((uint8_t *)data); + memcpy(&timeout->l4proto, data, sizeof(timeout->l4proto)); break; case NFTNL_OBJ_CT_TIMEOUT_ARRAY: memcpy(timeout->timeout, data, -- cgit v1.2.3