diff options
| author | Matt Turner <mattst88@gmail.com> | 2018-10-17 12:32:54 -0700 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-19 14:56:08 +0200 |
| commit | dc240913458d591f59b52b3899d3fc3c5d6ec6ce (patch) | |
| tree | b43acfe0306f2ab42a5f5abccc42420fe6a5508c /src/expr/payload.c | |
| parent | aecc936180d302947ecfab5dacf267a701a5d84c (diff) | |
src: Use memcpy() to handle potentially unaligned data
Rolf Eike Beer <eike@sf-mail.de> 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 <mattst88@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/payload.c')
| -rw-r--r-- | src/expr/payload.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/expr/payload.c b/src/expr/payload.c index 4b2f322..680da4a 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -43,28 +43,28 @@ nftnl_expr_payload_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_PAYLOAD_SREG: - payload->sreg = *((uint32_t *)data); + memcpy(&payload->sreg, data, sizeof(payload->sreg)); break; case NFTNL_EXPR_PAYLOAD_DREG: - payload->dreg = *((uint32_t *)data); + memcpy(&payload->dreg, data, sizeof(payload->dreg)); break; case NFTNL_EXPR_PAYLOAD_BASE: - payload->base = *((uint32_t *)data); + memcpy(&payload->base, data, sizeof(payload->base)); break; case NFTNL_EXPR_PAYLOAD_OFFSET: - payload->offset = *((unsigned int *)data); + memcpy(&payload->offset, data, sizeof(payload->offset)); break; case NFTNL_EXPR_PAYLOAD_LEN: - payload->len = *((unsigned int *)data); + memcpy(&payload->len, data, sizeof(payload->len)); break; case NFTNL_EXPR_PAYLOAD_CSUM_TYPE: - payload->csum_type = *((uint32_t *)data); + memcpy(&payload->csum_type, data, sizeof(payload->csum_type)); break; case NFTNL_EXPR_PAYLOAD_CSUM_OFFSET: - payload->csum_offset = *((uint32_t *)data); + memcpy(&payload->csum_offset, data, sizeof(payload->csum_offset)); break; case NFTNL_EXPR_PAYLOAD_FLAGS: - payload->csum_flags = *((uint32_t *)data); + memcpy(&payload->csum_flags, data, sizeof(payload->csum_flags)); break; default: return -1; |