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/log.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/expr/log.c') diff --git a/src/expr/log.c b/src/expr/log.c index e4bf051..1119c53 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -46,19 +46,19 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type, return -1; break; case NFTNL_EXPR_LOG_GROUP: - log->group = *((uint16_t *)data); + memcpy(&log->group, data, sizeof(log->group)); break; case NFTNL_EXPR_LOG_SNAPLEN: - log->snaplen = *((uint32_t *)data); + memcpy(&log->snaplen, data, sizeof(log->snaplen)); break; case NFTNL_EXPR_LOG_QTHRESHOLD: - log->qthreshold = *((uint16_t *)data); + memcpy(&log->qthreshold, data, sizeof(log->qthreshold)); break; case NFTNL_EXPR_LOG_LEVEL: - log->level = *((uint32_t *)data); + memcpy(&log->level, data, sizeof(log->level)); break; case NFTNL_EXPR_LOG_FLAGS: - log->flags = *((uint32_t *)data); + memcpy(&log->flags, data, sizeof(log->flags)); break; default: return -1; -- cgit v1.2.3