cls_flower: call nla_ok() before nla_next()
Subsystems (3)
PATCH v4 1/1 cls_flower: call nla_ok() before nla_next()
From: Cong Wang <[email protected]>
fl_set_enc_opt() simply checks if there are still bytes left to parse, but this is not sufficent as syzbot seems to be able to generate malformatted netlink messages. nla_ok() is more strict so should be used to validate the next nlattr here.
And nla_validate_nested_deprecated() has less strict check too, it is probably too late to switch to the strict version, but we can just call nla_ok() too after it.
--- net/sched/cls_flower.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/sched/cls_flower.c +13 -9
@@ -1272,6 +1272,10 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key, nla_opt_msk =nla_data (tb[TCA_FLOWER_KEY_ENC_OPTS_MASK ]); msk_depth =nla_len (tb[TCA_FLOWER_KEY_ENC_OPTS_MASK ]); +if (!nla_ok (nla_opt_msk, msk_depth)) { +NL_SET_ERR_MSG (extack,"Invalid nested attribute for masks" ); +return -EINVAL ; + } } nla_for_each_attr(nla_opt_key, nla_enc_key,
@@ -1307,9 +1311,6 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key,NL_SET_ERR_MSG (extack,"Key and mask miss aligned" );return -EINVAL ; } - -if (msk_depth) - nla_opt_msk =nla_next (nla_opt_msk, &msk_depth);break ;case TCA_FLOWER_KEY_ENC_OPTS_VXLAN :if (key->enc_opts.dst_opt_type) {
@@ -1340,9 +1341,6 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key,NL_SET_ERR_MSG (extack,"Key and mask miss aligned" );return -EINVAL ; } - -if (msk_depth) - nla_opt_msk =nla_next (nla_opt_msk, &msk_depth);break ;case TCA_FLOWER_KEY_ENC_OPTS_ERSPAN :if (key->enc_opts.dst_opt_type) {
@@ -1373,14 +1371,20 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key,NL_SET_ERR_MSG (extack,"Key and mask miss aligned" );return -EINVAL ; } - -if (msk_depth) - nla_opt_msk =nla_next (nla_opt_msk, &msk_depth);break ;default :NL_SET_ERR_MSG (extack,"Unknown tunnel option type" );return -EINVAL ; } + +if (!msk_depth) +continue ; + +if (!nla_ok (nla_opt_msk, msk_depth)) { +NL_SET_ERR_MSG (extack,"A mask attribute is invalid" ); +return -EINVAL ; + } + nla_opt_msk =nla_next (nla_opt_msk, &msk_depth); }return 0 ;
Signature · 1 line
2.25.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Fri, 15 Jan 2021 10:50:24 -0800 you wrote:
From: Cong Wang <[email protected]>
fl_set_enc_opt()simply checks if there are still bytes left to parse, but this is not sufficent as syzbot seems to be able to generate malformatted netlink messages.nla_ok()is more strict so should be used to validate the next nlattr here.[...]
Here is the summary with links:
- [net,v4] cls_flower: call nla_ok() before nla_next()
https://git.kernel.org/netdev/net/c/c96adff95619
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html