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/nat.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/nat.c')
-rw-r--r-- | src/expr/nat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/expr/nat.c b/src/expr/nat.c index 9be78f3..38fccb0 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -42,25 +42,25 @@ nftnl_expr_nat_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_NAT_TYPE: - nat->type = *((uint32_t *)data); + memcpy(&nat->type, data, sizeof(nat->type)); break; case NFTNL_EXPR_NAT_FAMILY: - nat->family = *((uint32_t *)data); + memcpy(&nat->family, data, sizeof(nat->family)); break; case NFTNL_EXPR_NAT_REG_ADDR_MIN: - nat->sreg_addr_min = *((uint32_t *)data); + memcpy(&nat->sreg_addr_min, data, sizeof(nat->sreg_addr_min)); break; case NFTNL_EXPR_NAT_REG_ADDR_MAX: - nat->sreg_addr_max = *((uint32_t *)data); + memcpy(&nat->sreg_addr_max, data, sizeof(nat->sreg_addr_max)); break; case NFTNL_EXPR_NAT_REG_PROTO_MIN: - nat->sreg_proto_min = *((uint32_t *)data); + memcpy(&nat->sreg_proto_min, data, sizeof(nat->sreg_proto_min)); break; case NFTNL_EXPR_NAT_REG_PROTO_MAX: - nat->sreg_proto_max = *((uint32_t *)data); + memcpy(&nat->sreg_proto_max, data, sizeof(nat->sreg_proto_max)); break; case NFTNL_EXPR_NAT_FLAGS: - nat->flags = *((uint32_t *)data); + memcpy(&nat->flags, data, sizeof(nat->flags)); break; default: return -1; |