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.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.c')
| -rw-r--r-- | src/set.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -142,43 +142,43 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, return -1; break; case NFTNL_SET_HANDLE: - s->handle = *((uint64_t *)data); + memcpy(&s->handle, data, sizeof(s->handle)); break; case NFTNL_SET_FLAGS: - s->set_flags = *((uint32_t *)data); + memcpy(&s->set_flags, data, sizeof(s->set_flags)); break; case NFTNL_SET_KEY_TYPE: - s->key_type = *((uint32_t *)data); + memcpy(&s->key_type, data, sizeof(s->key_type)); break; case NFTNL_SET_KEY_LEN: - s->key_len = *((uint32_t *)data); + memcpy(&s->key_len, data, sizeof(s->key_len)); break; case NFTNL_SET_DATA_TYPE: - s->data_type = *((uint32_t *)data); + memcpy(&s->data_type, data, sizeof(s->data_type)); break; case NFTNL_SET_DATA_LEN: - s->data_len = *((uint32_t *)data); + memcpy(&s->data_len, data, sizeof(s->data_len)); break; case NFTNL_SET_OBJ_TYPE: - s->obj_type = *((uint32_t *)data); + memcpy(&s->obj_type, data, sizeof(s->obj_type)); break; case NFTNL_SET_FAMILY: - s->family = *((uint32_t *)data); + memcpy(&s->family, data, sizeof(s->family)); break; case NFTNL_SET_ID: - s->id = *((uint32_t *)data); + memcpy(&s->id, data, sizeof(s->id)); break; case NFTNL_SET_POLICY: - s->policy = *((uint32_t *)data); + memcpy(&s->policy, data, sizeof(s->policy)); break; case NFTNL_SET_DESC_SIZE: - s->desc.size = *((uint32_t *)data); + memcpy(&s->desc.size, data, sizeof(s->desc.size)); break; case NFTNL_SET_TIMEOUT: - s->timeout = *((uint64_t *)data); + memcpy(&s->timeout, data, sizeof(s->timeout)); break; case NFTNL_SET_GC_INTERVAL: - s->gc_interval = *((uint32_t *)data); + memcpy(&s->gc_interval, data, sizeof(s->gc_interval)); break; case NFTNL_SET_USERDATA: if (s->flags & (1 << NFTNL_SET_USERDATA)) |