netfilter: nf_tables: validate variable length element extension
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nf_tables: validate variable length element extension
Update template to validate variable length extensions. This patch adds a new .ext_len[id] field to the template to store the expected extension length. This is used to sanity check the initialization of the variable length extension.
Use PTR_ERR() in nft_set_elem_init() to report errors since, after this update, there are two reason why this might fail, either because of ENOMEM or insufficient room in the extension field (EINVAL).
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: rebase on top of nf.git
include/net/netfilter/nf_tables.h | 4 +- net/netfilter/nf_tables_api.c | 82 +++++++++++++++++++++++++------ net/netfilter/nft_dynset.c | 2 +- 3 files changed, 72 insertions(+), 16 deletions(-)
include/net/netfilter/nf_tables.h +3 -1
@@ -636,6 +636,7 @@ extern const struct nft_set_ext_type nft_set_ext_types[];struct nft_set_ext_tmpl {u16 len;u8 offset[NFT_SET_EXT_NUM ]; +u8 ext_len[NFT_SET_EXT_NUM ]; };/**
@@ -665,7 +666,8 @@ static inline int nft_set_ext_add_length(struct nft_set_ext_tmpl *tmpl, u8 id,return -EINVAL ; tmpl->offset[id] = tmpl->len; - tmpl->len += nft_set_ext_types[id].len + len; + tmpl->ext_len[id] = nft_set_ext_types[id].len + len; + tmpl->len += tmpl->ext_len[id];return 0 ; }
net/netfilter/nf_tables_api.c +68 -14
157 lines not on this page · raw message
net/netfilter/nft_dynset.c +1 -1
@@ -60,7 +60,7 @@ static void *nft_dynset_new(struct nft_set *set, const struct nft_expr *expr, ®s->data[priv->sreg_key],NULL , ®s->data[priv->sreg_data], timeout, 0, GFP_ATOMIC); -if (elem ==NULL ) +if (IS_ERR (elem)) goto err1; ext =nft_set_elem_ext (set, elem);
Signature · 1 line
2.30.2