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/rule.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/rule.c')
-rw-r--r-- | src/rule.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -152,19 +152,19 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, return -1; break; case NFTNL_RULE_HANDLE: - r->handle = *((uint64_t *)data); + memcpy(&r->handle, data, sizeof(r->handle)); break; case NFTNL_RULE_COMPAT_PROTO: - r->compat.proto = *((uint32_t *)data); + memcpy(&r->compat.proto, data, sizeof(r->compat.proto)); break; case NFTNL_RULE_COMPAT_FLAGS: - r->compat.flags = *((uint32_t *)data); + memcpy(&r->compat.flags, data, sizeof(r->compat.flags)); break; case NFTNL_RULE_FAMILY: - r->family = *((uint32_t *)data); + memcpy(&r->family, data, sizeof(r->family)); break; case NFTNL_RULE_POSITION: - r->position = *((uint64_t *)data); + memcpy(&r->position, data, sizeof(r->position)); break; case NFTNL_RULE_USERDATA: if (r->flags & (1 << NFTNL_RULE_USERDATA)) @@ -178,7 +178,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, r->user.len = data_len; break; case NFTNL_RULE_ID: - r->id = *((uint32_t *)data); + memcpy(&r->id, data, sizeof(r->id)); break; } r->flags |= (1 << attr); |