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/quota.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/obj/quota.c') diff --git a/src/obj/quota.c b/src/obj/quota.c index b1a3f7e..1914037 100644 --- a/src/obj/quota.c +++ b/src/obj/quota.c @@ -28,13 +28,13 @@ static int nftnl_obj_quota_set(struct nftnl_obj *e, uint16_t type, switch (type) { case NFTNL_OBJ_QUOTA_BYTES: - quota->bytes = *((uint64_t *)data); + memcpy("a->bytes, data, sizeof(quota->bytes)); break; case NFTNL_OBJ_QUOTA_CONSUMED: - quota->consumed = *((uint64_t *)data); + memcpy("a->consumed, data, sizeof(quota->consumed)); break; case NFTNL_OBJ_QUOTA_FLAGS: - quota->flags = *((uint32_t *)data); + memcpy("a->flags, data, sizeof(quota->flags)); break; default: return -1; -- cgit v1.2.3