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/expr/fwd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/expr/fwd.c') diff --git a/src/expr/fwd.c b/src/expr/fwd.c index 9890e9a..9cb0aca 100644 --- a/src/expr/fwd.c +++ b/src/expr/fwd.c @@ -34,13 +34,13 @@ static int nftnl_expr_fwd_set(struct nftnl_expr *e, uint16_t type, switch (type) { case NFTNL_EXPR_FWD_SREG_DEV: - fwd->sreg_dev = *((uint32_t *)data); + memcpy(&fwd->sreg_dev, data, sizeof(fwd->sreg_dev)); break; case NFTNL_EXPR_FWD_SREG_ADDR: - fwd->sreg_addr = *((uint32_t *)data); + memcpy(&fwd->sreg_addr, data, sizeof(fwd->sreg_addr)); break; case NFTNL_EXPR_FWD_NFPROTO: - fwd->nfproto = *((uint32_t *)data); + memcpy(&fwd->nfproto, data, sizeof(fwd->nfproto)); break; default: return -1; -- cgit v1.2.3