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/dynset.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/dynset.c')
-rw-r--r-- | src/expr/dynset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expr/dynset.c b/src/expr/dynset.c index 3d24ef8..f009ec4 100644 --- a/src/expr/dynset.c +++ b/src/expr/dynset.c @@ -40,16 +40,16 @@ nftnl_expr_dynset_set(struct nftnl_expr *e, uint16_t type, switch (type) { case NFTNL_EXPR_DYNSET_SREG_KEY: - dynset->sreg_key = *((uint32_t *)data); + memcpy(&dynset->sreg_key, data, sizeof(dynset->sreg_key)); break; case NFTNL_EXPR_DYNSET_SREG_DATA: - dynset->sreg_data = *((uint32_t *)data); + memcpy(&dynset->sreg_data, data, sizeof(dynset->sreg_data)); break; case NFTNL_EXPR_DYNSET_OP: - dynset->op = *((uint32_t *)data); + memcpy(&dynset->op, data, sizeof(dynset->op)); break; case NFTNL_EXPR_DYNSET_TIMEOUT: - dynset->timeout = *((uint64_t *)data); + memcpy(&dynset->timeout, data, sizeof(dynset->timeout)); break; case NFTNL_EXPR_DYNSET_SET_NAME: dynset->set_name = strdup((const char *)data); @@ -57,7 +57,7 @@ nftnl_expr_dynset_set(struct nftnl_expr *e, uint16_t type, return -1; break; case NFTNL_EXPR_DYNSET_SET_ID: - dynset->set_id = *((uint32_t *)data); + memcpy(&dynset->set_id, data, sizeof(dynset->set_id)); break; case NFTNL_EXPR_DYNSET_EXPR: dynset->expr = (void *)data; |