summaryrefslogtreecommitdiffstats
path: root/src/expr/lookup.c
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2018-10-17 12:32:54 -0700
committerPablo Neira Ayuso <pablo@netfilter.org>2018-10-19 14:56:08 +0200
commitdc240913458d591f59b52b3899d3fc3c5d6ec6ce (patch)
treeb43acfe0306f2ab42a5f5abccc42420fe6a5508c /src/expr/lookup.c
parentaecc936180d302947ecfab5dacf267a701a5d84c (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/lookup.c')
-rw-r--r--src/expr/lookup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 132dc4e..a502e2a 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -37,10 +37,10 @@ nftnl_expr_lookup_set(struct nftnl_expr *e, uint16_t type,
switch(type) {
case NFTNL_EXPR_LOOKUP_SREG:
- lookup->sreg = *((uint32_t *)data);
+ memcpy(&lookup->sreg, data, sizeof(lookup->sreg));
break;
case NFTNL_EXPR_LOOKUP_DREG:
- lookup->dreg = *((uint32_t *)data);
+ memcpy(&lookup->dreg, data, sizeof(lookup->dreg));
break;
case NFTNL_EXPR_LOOKUP_SET:
lookup->set_name = strdup((const char *)data);
@@ -48,10 +48,10 @@ nftnl_expr_lookup_set(struct nftnl_expr *e, uint16_t type,
return -1;
break;
case NFTNL_EXPR_LOOKUP_SET_ID:
- lookup->set_id = *((uint32_t *)data);
+ memcpy(&lookup->set_id, data, sizeof(lookup->set_id));
break;
case NFTNL_EXPR_LOOKUP_FLAGS:
- lookup->flags = *((uint32_t *)data);
+ memcpy(&lookup->flags, data, sizeof(lookup->flags));
break;
default:
return -1;