Use safe nftnl_data_cpy() to copy key into union nftnl_data_reg. Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> --- src/set_elem.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/set_elem.c b/src/set_elem.c index 884faff432a9..34258d24e85f 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -126,13 +126,9 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, 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; + return nftnl_data_cpy(&s->key, data, data_len); case NFTNL_SET_ELEM_KEY_END: /* NFTA_SET_ELEM_KEY_END */ - memcpy(&s->key_end.val, data, data_len); - s->key_end.len = data_len; - break; + return nftnl_data_cpy(&s->key_end, data, data_len); case NFTNL_SET_ELEM_VERDICT: /* NFTA_SET_ELEM_DATA */ memcpy(&s->data.verdict, data, sizeof(s->data.verdict)); break; @@ -145,9 +141,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, return -1; break; case NFTNL_SET_ELEM_DATA: /* NFTA_SET_ELEM_DATA */ - memcpy(s->data.val, data, data_len); - s->data.len = data_len; - break; + return nftnl_data_cpy(&s->data, data, data_len); case NFTNL_SET_ELEM_TIMEOUT: /* NFTA_SET_ELEM_TIMEOUT */ memcpy(&s->timeout, data, sizeof(s->timeout)); break; -- 2.30.2
