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/meta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/expr/meta.c') diff --git a/src/expr/meta.c b/src/expr/meta.c index b66b9b7..3654837 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -39,13 +39,13 @@ nftnl_expr_meta_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_META_KEY: - meta->key = *((uint32_t *)data); + memcpy(&meta->key, data, sizeof(meta->key)); break; case NFTNL_EXPR_META_DREG: - meta->dreg = *((uint32_t *)data); + memcpy(&meta->dreg, data, sizeof(meta->dreg)); break; case NFTNL_EXPR_META_SREG: - meta->sreg = *((uint32_t *)data); + memcpy(&meta->sreg, data, sizeof(meta->sreg)); break; default: return -1; -- cgit v1.2.3