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/xfrm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/expr/xfrm.c') diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c index dd3062c..7c6f98e 100644 --- a/src/expr/xfrm.c +++ b/src/expr/xfrm.c @@ -33,16 +33,16 @@ nftnl_expr_xfrm_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_XFRM_KEY: - x->key = *((uint32_t *)data); + memcpy(&x->key, data, sizeof(x->key)); break; case NFTNL_EXPR_XFRM_DIR: - x->dir = *((uint8_t *)data); + memcpy(&x->dir, data, sizeof(x->dir)); break; case NFTNL_EXPR_XFRM_SPNUM: - x->spnum = *((uint32_t *)data); + memcpy(&x->spnum, data, sizeof(x->spnum)); break; case NFTNL_EXPR_XFRM_DREG: - x->dreg = *((uint32_t *)data); + memcpy(&x->dreg, data, sizeof(x->dreg)); break; default: return -1; -- cgit v1.2.3