set_elem: use nftnl_data_cpy() in NFTNL_SET_ELEM_{KEY,KEY_END,DATA}
Pablo Neira Ayuso
maintainerPATCH 1/1 set_elem: use nftnl_data_cpy() in NFTNL_SET_ELEM_{KEY,KEY_END,DATA}
Use safe nftnl_data_cpy() to copy key into union nftnl_data_reg.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: do not skip s->flags update.
src/set_elem.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
src/set_elem.c +6 -7
@@ -117,6 +117,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, const void *data, uint32_t data_len) {struct nftnl_expr *expr, *tmp; +int ret =0 ;nftnl_assert_attr_exists (attr,NFTNL_SET_ELEM_MAX );nftnl_assert_validate (data, nftnl_set_elem_validate, attr, data_len);
@@ -126,12 +127,10 @@ 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; + ret =nftnl_data_cpy (&s->key, data, data_len);break ;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; + ret =nftnl_data_cpy (&s->key_end, data, data_len);break ;case NFTNL_SET_ELEM_VERDICT :/* NFTA_SET_ELEM_DATA */ memcpy (&s->data.verdict, data,sizeof (s->data.verdict));
@@ -145,8 +144,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; + ret =nftnl_data_cpy (&s->data, data, data_len);break ;case NFTNL_SET_ELEM_TIMEOUT :/* NFTA_SET_ELEM_TIMEOUT */ memcpy (&s->timeout, data,sizeof (s->timeout));
@@ -181,7 +179,8 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,break ; } s->flags |= (1 << attr); -return 0 ; + +return ret; }EXPORT_SYMBOL (nftnl_set_elem_set_u32);
Signature · 1 line
2.30.2