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/set_elem.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/set_elem.c')
| -rw-r--r-- | src/set_elem.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/set_elem.c b/src/set_elem.c index bb8d046..ff983a6 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -102,14 +102,14 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, { switch(attr) { case NFTNL_SET_ELEM_FLAGS: - s->set_elem_flags = *((uint32_t *)data); + memcpy(&s->set_elem_flags, data, sizeof(s->set_elem_flags)); break; case NFTNL_SET_ELEM_KEY: /* NFTA_SET_ELEM_KEY */ memcpy(&s->key.val, data, data_len); s->key.len = data_len; break; case NFTNL_SET_ELEM_VERDICT: /* NFTA_SET_ELEM_DATA */ - s->data.verdict = *((uint32_t *)data); + memcpy(&s->data.verdict, data, sizeof(s->data.verdict)); break; case NFTNL_SET_ELEM_CHAIN: /* NFTA_SET_ELEM_DATA */ if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) @@ -124,7 +124,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, s->data.len = data_len; break; case NFTNL_SET_ELEM_TIMEOUT: /* NFTA_SET_ELEM_TIMEOUT */ - s->timeout = *((uint64_t *)data); + memcpy(&s->timeout, data, sizeof(s->timeout)); break; case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA)) @@ -218,8 +218,10 @@ const char *nftnl_set_elem_get_str(struct nftnl_set_elem *s, uint16_t attr) EXPORT_SYMBOL(nftnl_set_elem_get_u32); uint32_t nftnl_set_elem_get_u32(struct nftnl_set_elem *s, uint16_t attr) { - uint32_t size; - uint32_t val = *((uint32_t *)nftnl_set_elem_get(s, attr, &size)); + uint32_t size, val; + + memcpy(&val, nftnl_set_elem_get(s, attr, &size), sizeof(val)); + return val; } @@ -227,7 +229,10 @@ EXPORT_SYMBOL(nftnl_set_elem_get_u64); uint64_t nftnl_set_elem_get_u64(struct nftnl_set_elem *s, uint16_t attr) { uint32_t size; - uint64_t val = *((uint64_t *)nftnl_set_elem_get(s, attr, &size)); + uint64_t val; + + memcpy(&val, nftnl_set_elem_get(s, attr, &size), sizeof(val)); + return val; } |