set_elem: Validate nftnl_set_elem_set() parameters
Phil Sutter
reviewerPATCH v2 1/1 set_elem: Validate nftnl_set_elem_set() parameters
Copying from nftnl_table_set_data(), validate input to nftnl_set_elem_set() as well. Given that for some attributes the function assumes passed data size, this seems necessary.
Since data size expected for NFTNL_SET_ELEM_VERDICT attribute is sizeof(uint32_t), change type of 'verdict' field in union nftnl_data_reg accordingly.
---
Changes since v1:
- Change union nftnl_data_reg as outlined above.
--- include/data_reg.h | 2 +- include/libnftnl/set.h | 2 ++ src/set_elem.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-)
include/data_reg.h +1 -1
@@ -19,7 +19,7 @@ union nftnl_data_reg {uint32_t len; };struct { -int verdict; +uint32_t verdict;const char *chain; }; };
include/libnftnl/set.h +2 -0
@@ -104,7 +104,9 @@ enum {NFTNL_SET_ELEM_USERDATA ,NFTNL_SET_ELEM_EXPR ,NFTNL_SET_ELEM_OBJREF , + __NFTNL_SET_ELEM_MAX }; +#define NFTNL_SET_ELEM_MAX (__NFTNL_SET_ELEM_MAX - 1)struct nftnl_set_elem ;
src/set_elem.c +10 -0
@@ -96,10 +96,20 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) s->flags &= ~(1 << attr); } +static uint32_t nftnl_set_elem_validate[NFTNL_SET_ELEM_MAX +1 ] = { + [NFTNL_SET_ELEM_FLAGS ] =sizeof (uint32_t ), + [NFTNL_SET_ELEM_VERDICT ] =sizeof (uint32_t ), + [NFTNL_SET_ELEM_TIMEOUT ] =sizeof (uint64_t ), + [NFTNL_SET_ELEM_EXPIRATION ] =sizeof (uint64_t ), +}; +EXPORT_SYMBOL (nftnl_set_elem_set);int nftnl_set_elem_set (struct nftnl_set_elem *s,uint16_t attr,const void *data,uint32_t data_len) { +nftnl_assert_attr_exists (attr,NFTNL_SET_ELEM_MAX ); +nftnl_assert_validate (data, nftnl_set_elem_validate, attr, data_len); +switch (attr) {case NFTNL_SET_ELEM_FLAGS :memcpy (&s->set_elem_flags, data,sizeof (s->set_elem_flags));
Signature · 1 line
2.23.0
Quoted 9 lines · Phil Sutter
Copying from
nftnl_table_set_data(), validate input tonftnl_set_elem_set()as well. Given that for some attributes the function assumes passed data size, this seems necessary.Since data size expected for
NFTNL_SET_ELEM_VERDICTattribute issizeof(uint32_t), change type of 'verdict' field in unionnftnl_data_regaccordingly.Signed-off-by Phil Sutter <[email protected]>