netfilter: nf_tables: release element key when parser fails
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/2 netfilter: nf_tables: release element key when parser fails
Call nft_data_release() to release the element keys otherwise this might leak chain reference counter.
---
v2: coalesce two similar patches:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/ https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
net/netfilter/nf_tables_api.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
net/netfilter/nf_tables_api.c +16 -6
@@ -5306,17 +5306,17 @@ static int nft_get_set_elem(struct nft_ctx *ctx, struct nft_set *set, err =nft_setelem_parse_key (ctx, set, &elem.key_end.val, nla[NFTA_SET_ELEM_KEY_END ]);if (err <0 ) -return err; + goto err_parse_key; } err =nft_setelem_get (ctx, set, &elem, flags);if (err <0 ) -return err; + goto err_parse_key_end; err = -ENOMEM ; skb =nlmsg_new (NLMSG_GOODSIZE ,GFP_ATOMIC );if (skb ==NULL ) -return err; + goto err_parse_key_end; err =nf_tables_fill_setelem_info (skb, ctx, ctx->seq, ctx->portid,NFT_MSG_NEWSETELEM ,0 , set, &elem);
@@ -5327,6 +5327,11 @@ static int nft_get_set_elem(struct nft_ctx *ctx, struct nft_set *set, err_fill_setelem:kfree_skb (skb); +err_parse_key: +nft_data_release (&elem.key.val,NFT_DATA_VALUE ); +err_parse_key_end: +nft_data_release (&elem.key_end.val,NFT_DATA_VALUE ); +return err; }
@@ -6272,7 +6277,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set, err =nft_setelem_parse_key (ctx, set, &elem.key_end.val, nla[NFTA_SET_ELEM_KEY_END ]);if (err <0 ) -return err; + goto fail_elem;nft_set_ext_add_length (&tmpl,NFT_SET_EXT_KEY_END , set->klen); }
@@ -6281,8 +6286,10 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set, elem.priv =nft_set_elem_init (set, &tmpl, elem.key.val.data, elem.key_end.val.data,NULL ,0 ,0 ,GFP_KERNEL_ACCOUNT ); -if (elem.priv ==NULL ) - goto fail_elem; +if (elem.priv ==NULL ) { + err =PTR_ERR (elem.priv); + goto fail_elem_key_end; + } ext =nft_set_elem_ext (set, elem.priv);if (flags)
@@ -6306,8 +6313,11 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,kfree (trans); fail_trans:kfree (elem.priv); +fail_elem_key_end: +nft_data_release (&elem.key_end.val,NFT_DATA_VALUE ); fail_elem:nft_data_release (&elem.key.val,NFT_DATA_VALUE ); +return err; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 2/2 netfilter: nf_tables: replace BUG_ON by element length check
BUG_ON can be triggered from userspace with an element with a large userdata area. Replace it by length check and return EINVAL instead. Over time extensions have been growing in size.
Pick a sufficiently old Fixes: tag to propagate this fix.
---
v2: add a few missing check for nft_set_ext_add() returned value.
include/net/netfilter/nf_tables.h | 14 ++++--- net/netfilter/nf_tables_api.c | 66 ++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 24 deletions(-)
include/net/netfilter/nf_tables.h +9 -5
@@ -657,18 +657,22 @@ static inline void nft_set_ext_prepare(struct nft_set_ext_tmpl *tmpl) tmpl->len =sizeof (struct nft_set_ext ); } -static inline void nft_set_ext_add_length (struct nft_set_ext_tmpl *tmpl,u8 id, -unsigned int len) +static inline int nft_set_ext_add_length (struct nft_set_ext_tmpl *tmpl,u8 id, +unsigned int len) { tmpl->len =ALIGN (tmpl->len, nft_set_ext_types[id].align); -BUG_ON (tmpl->len >U8_MAX ); +if (tmpl->len >U8_MAX ) +return -EINVAL ; + tmpl->offset[id] = tmpl->len; tmpl->len += nft_set_ext_types[id].len + len; + +return 0 ; } -static inline void nft_set_ext_add (struct nft_set_ext_tmpl *tmpl,u8 id) +static inline int nft_set_ext_add (struct nft_set_ext_tmpl *tmpl,u8 id) { -nft_set_ext_add_length (tmpl, id,0 ); +return nft_set_ext_add_length (tmpl, id,0 ); } static inline void nft_set_ext_init(struct nft_set_ext *ext,
net/netfilter/nf_tables_api.c +47 -19
129 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerQuoted 10 lines · Pablo Neira Ayuso
Call
nft_data_release()to release the element keys otherwise this might leak chain reference counter.Fixes 7b225d0b5c6d ("netfilter: nf_tables: add NFTA_SET_ELEM_KEY_END attribute")Fixes ba0e4d9917b4 ("netfilter: nf_tables: get set elements via netlink")Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: coalesce two similar patches:https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/ https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
Scratch this. nft_data_release() is noop for NFT_DATA_VERDICT case. Calling this is good for consistency, but let's schedule this patch for nf-next instead.
Pablo Neira Ayuso
maintainerQuoted 12 lines · Pablo Neira Ayuso
Quoted 10 lines · Pablo Neira Ayuso
Call
nft_data_release()to release the element keys otherwise this might leak chain reference counter.Fixes 7b225d0b5c6d ("netfilter: nf_tables: add NFTA_SET_ELEM_KEY_END attribute")Fixes ba0e4d9917b4 ("netfilter: nf_tables: get set elements via netlink")Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: coalesce two similar patches:https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/ https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
Quoted 1 line
Scratch this.
nft_data_release()is noop forNFT_DATA_VERDICTcase.
s/NFT_DATA_VERDICT/NFT_DATA_VALUE
Quoted 2 lines
Calling this is good for consistency, but let's schedule this patch for nf-next instead.
Dan Carpenter
build botCC: kbuild-all(a)lists.01.org BCC: lkp(a)intel.com In-Reply-To: <[email protected]> References: <[email protected]> TO: Pablo Neira Ayuso…
CC: kbuild-all(a)lists.01.org
BCC: lkp(a)intel.com
In-Reply-To: <[email protected]>
References: <[email protected]>
TO: Pablo Neira Ayuso <[email protected]>
TO: netfilter-devel(a)vger.kernel.org
Hi Pablo,
I love your patch! Perhaps something to improve:
[auto build test WARNING on nf/master]
[also build test WARNING on linus/master v5.19-rc5 next-20220708] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-release-element-key-when-parser-fails/20220708-180911 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
:::::: branch date: 2 days ago
:::::: commit date: 2 days ago
config: x86_64-rhel-8.3-kselftests (https://download.01.org/0day-ci/archive/20220710/202207100802.TRaePFrj-lkp(a)intel.com/config)
compiler: gcc-11 (Debian 11.3.0-3) 11.3.0
If you fix the issue, kindly add following tag where applicable
smatch warnings:net/netfilter/nf_tables_api.c:6254 nft_del_setelem() warn: passing zero to 'PTR_ERR'
vim +/PTR_ERR +6254 net/netfilter/nf_tables_api.c
591054469b3eef Pablo Neira Ayuso 2017-05-15 6202
60319eb1ca351a Pablo Neira Ayuso 2014-04-04 6203 static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
20a69341f2d00c Patrick McHardy 2013-10-11 6204 const struct nlattr *attr)
20a69341f2d00c Patrick McHardy 2013-10-11 6205 {
20a69341f2d00c Patrick McHardy 2013-10-11 6206 struct nlattr *nla[NFTA_SET_ELEM_MAX + 1];
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6207 struct nft_set_ext_tmpl tmpl;
20a69341f2d00c Patrick McHardy 2013-10-11 6208 struct nft_set_elem elem;
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6209 struct nft_set_ext *ext;
60319eb1ca351a Pablo Neira Ayuso 2014-04-04 6210 struct nft_trans *trans;
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6211 u32 flags = 0;
20a69341f2d00c Patrick McHardy 2013-10-11 6212 int err;
20a69341f2d00c Patrick McHardy 2013-10-11 6213
8cb081746c031f Johannes Berg 2019-04-26 6214 err = nla_parse_nested_deprecated(nla, NFTA_SET_ELEM_MAX, attr,
fceb6435e85298 Johannes Berg 2017-04-12 6215 nft_set_elem_policy, NULL);
20a69341f2d00c Patrick McHardy 2013-10-11 6216 if (err < 0)
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6217 return err;
20a69341f2d00c Patrick McHardy 2013-10-11 6218
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6219 err = nft_setelem_parse_flags(set, nla[NFTA_SET_ELEM_FLAGS], &flags);
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6220 if (err < 0)
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6221 return err;
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6222
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6223 if (!nla[NFTA_SET_ELEM_KEY] && !(flags & NFT_SET_ELEM_CATCHALL))
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6224 return -EINVAL;
20a69341f2d00c Patrick McHardy 2013-10-11 6225
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6226 nft_set_ext_prepare(&tmpl);
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6227
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6228 if (flags != 0)
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6229 nft_set_ext_add(&tmpl, NFT_SET_EXT_FLAGS);
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6230
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6231 if (nla[NFTA_SET_ELEM_KEY]) {
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6232 err = nft_setelem_parse_key(ctx, set, &elem.key.val,
d0a11fc3dc4ab4 Patrick McHardy 2015-04-11 6233 nla[NFTA_SET_ELEM_KEY]);
20a69341f2d00c Patrick McHardy 2013-10-11 6234 if (err < 0)
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6235 return err;
20a69341f2d00c Patrick McHardy 2013-10-11 6236
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6237 nft_set_ext_add_length(&tmpl, NFT_SET_EXT_KEY, set->klen);
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6238 }
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6239
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6240 if (nla[NFTA_SET_ELEM_KEY_END]) {
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6241 err = nft_setelem_parse_key(ctx, set, &elem.key_end.val,
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6242 nla[NFTA_SET_ELEM_KEY_END]);
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6243 if (err < 0)
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6244 goto fail_elem;
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6245
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6246 nft_set_ext_add_length(&tmpl, NFT_SET_EXT_KEY_END, set->klen);
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6247 }
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6248
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6249 err = -ENOMEM;
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6250 elem.priv = nft_set_elem_init(set, &tmpl, elem.key.val.data,
7b225d0b5c6dda Pablo Neira Ayuso 2020-01-22 6251 elem.key_end.val.data, NULL, 0, 0,
33758c891479ea Vasily Averin 2022-03-24 6252 GFP_KERNEL_ACCOUNT);
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6253 if (elem.priv == NULL) {
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 @6254 err = PTR_ERR(elem.priv);
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6255 goto fail_elem_key_end;
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6256 }
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6257
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6258 ext = nft_set_elem_ext(set, elem.priv);
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6259 if (flags)
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6260 *nft_set_ext_flags(ext) = flags;
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6261
60319eb1ca351a Pablo Neira Ayuso 2014-04-04 6262 trans = nft_trans_elem_alloc(ctx, NFT_MSG_DELSETELEM, set);
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6263 if (trans == NULL)
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6264 goto fail_trans;
20a69341f2d00c Patrick McHardy 2013-10-11 6265
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6266 err = nft_setelem_deactivate(ctx->net, set, &elem, flags);
aaa31047a6d25d Pablo Neira Ayuso 2021-04-27 6267 if (err < 0)
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6268 goto fail_ops;
cc02e457bb86f7 Patrick McHardy 2015-03-25 6269
f8bb7889af58d8 Pablo Neira Ayuso 2021-04-27 6270 nft_setelem_data_deactivate(ctx->net, set, &elem);
591054469b3eef Pablo Neira Ayuso 2017-05-15 6271
60319eb1ca351a Pablo Neira Ayuso 2014-04-04 6272 nft_trans_elem(trans) = elem;
0854db2aaef3fc Florian Westphal 2021-04-01 6273 nft_trans_commit_list_add_tail(ctx->net, trans);
0dc1362562a2e8 Thomas Graf 2014-08-01 6274 return 0;
cc02e457bb86f7 Patrick McHardy 2015-03-25 6275
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6276 fail_ops:
cc02e457bb86f7 Patrick McHardy 2015-03-25 6277 kfree(trans);
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6278 fail_trans:
3971ca14350062 Pablo Neira Ayuso 2016-04-12 6279 kfree(elem.priv);
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6280 fail_elem_key_end:
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6281 nft_data_release(&elem.key_end.val, NFT_DATA_VALUE);
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6282 fail_elem:
20a1452c35425b Pablo Neira Ayuso 2020-01-22 6283 nft_data_release(&elem.key.val, NFT_DATA_VALUE);
0973c5bfbf138f Pablo Neira Ayuso 2022-07-08 6284
20a69341f2d00c Patrick McHardy 2013-10-11 6285 return err;
20a69341f2d00c Patrick McHardy 2013-10-11 6286 }
20a69341f2d00c Patrick McHardy 2013-10-11 6287 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp