set_elem: use nftnl_data_cpy() in NFTNL_SET_ELEM_{KEY,KEY_END,DATA}
Pablo Neira Ayuso
maintainerPATCH v3 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.
Follow up for commit:
bc2afbde9eae ("expr: fix buffer overflows in data value setters")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v3: do not set s->flags in case nftnl_data_cpy() fails, otherwise _get() crashes
src/set_elem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
src/set_elem.c +6 -6
@@ -126,12 +126,12 @@ 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; +if (nftnl_data_cpy (&s->key, data, data_len) <0 ) +return -1 ;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; +if (nftnl_data_cpy (&s->key_end, data, data_len) <0 ) +return -1 ;break ;case NFTNL_SET_ELEM_VERDICT :/* NFTA_SET_ELEM_DATA */ memcpy (&s->data.verdict, data,sizeof (s->data.verdict));
@@ -145,8 +145,8 @@ 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; +if (nftnl_data_cpy (&s->data, data, data_len) <0 ) +return -1 ;break ;case NFTNL_SET_ELEM_TIMEOUT :/* NFTA_SET_ELEM_TIMEOUT */ memcpy (&s->timeout, data,sizeof (s->timeout));
Signature · 1 line
2.30.2