diff options
| -rw-r--r-- | include/data_reg.h | 2 | ||||
| -rw-r--r-- | include/libnftnl/set.h | 2 | ||||
| -rw-r--r-- | src/set_elem.c | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/data_reg.h b/include/data_reg.h index f2675f2..10517ba 100644 --- a/include/data_reg.h +++ b/include/data_reg.h @@ -19,7 +19,7 @@ union nftnl_data_reg { uint32_t len; }; struct { - int verdict; + uint32_t verdict; const char *chain; }; }; diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h index 6640ad9..2ea2e9a 100644 --- a/include/libnftnl/set.h +++ b/include/libnftnl/set.h @@ -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; diff --git a/src/set_elem.c b/src/set_elem.c index 3794f12..d3ce807 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -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)); |