net_sched: fix a UAF in tcf_action_init()
Subsystems (5)
cover net_sched: fix a UAF in tcf_action_init()
This patchset fixes a use-after-free triggered by syzbot. Please find more details in each patch description.
---
Cong Wang (2):
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
net_sched: commit action insertions together
include/net/act_api.h | 2 -- net/sched/act_api.c | 52 +++++++++++++++++++++++++------------- net/sched/act_bpf.c | 4 +-- net/sched/act_connmark.c | 1 - net/sched/act_csum.c | 3 --- net/sched/act_ct.c | 2 -- net/sched/act_ctinfo.c | 3 --- net/sched/act_gact.c | 2 -- net/sched/act_gate.c | 3 --- net/sched/act_ife.c | 3 --- net/sched/act_ipt.c | 2 -- net/sched/act_mirred.c | 2 -- net/sched/act_mpls.c | 2 -- net/sched/act_nat.c | 3 --- net/sched/act_pedit.c | 2 -- net/sched/act_police.c | 2 -- net/sched/act_sample.c | 2 -- net/sched/act_simple.c | 2 -- net/sched/act_skbedit.c | 2 -- net/sched/act_skbmod.c | 2 -- net/sched/act_tunnel_key.c | 3 --- net/sched/act_vlan.c | 2 -- 22 files changed, 35 insertions(+), 66 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/2 net_sched: defer tcf_idr_insert() in tcf_action_init_1()
All TC actions call tcf_idr_insert() for new action at the end of their ->init(), so we can actually move it to a central place in tcf_action_init_1().
And once the action is inserted into the global IDR, other parallel process could free it immediately as its refcnt is still 1, so we can not fail after this, we need to move it after the goto action validation to avoid handling the failure case after insertion.
This is found during code review, is not directly triggered by syzbot. And this prepares for the next patch.
--- include/net/act_api.h | 2 -- net/sched/act_api.c | 38 ++++++++++++++++++++------------------ net/sched/act_bpf.c | 4 +--- net/sched/act_connmark.c | 1 - net/sched/act_csum.c | 3 --- net/sched/act_ct.c | 2 -- net/sched/act_ctinfo.c | 3 --- net/sched/act_gact.c | 2 -- net/sched/act_gate.c | 3 --- net/sched/act_ife.c | 3 --- net/sched/act_ipt.c | 2 -- net/sched/act_mirred.c | 2 -- net/sched/act_mpls.c | 2 -- net/sched/act_nat.c | 3 --- net/sched/act_pedit.c | 2 -- net/sched/act_police.c | 2 -- net/sched/act_sample.c | 2 -- net/sched/act_simple.c | 2 -- net/sched/act_skbedit.c | 2 -- net/sched/act_skbmod.c | 2 -- net/sched/act_tunnel_key.c | 3 --- net/sched/act_vlan.c | 2 -- 22 files changed, 21 insertions(+), 66 deletions(-)
include/net/act_api.h +0 -2
@@ -166,8 +166,6 @@ int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index, struct nlattr *est, struct tc_action **a, const struct tc_action_ops *ops, int bind, u32 flags); -void tcf_idr_insert (struct tc_action_net *tn,struct tc_action *a); -void tcf_idr_cleanup (struct tc_action_net *tn,u32 index);int tcf_idr_check_alloc (struct tc_action_net *tn,u32 *index,struct tc_action **a,int bind);
net/sched/act_api.c +20 -18
@@ -467,17 +467,6 @@ int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index, }EXPORT_SYMBOL (tcf_idr_create_from_flags); -void tcf_idr_insert (struct tc_action_net *tn,struct tc_action *a) -{ -struct tcf_idrinfo *idrinfo = tn->idrinfo; - -mutex_lock (&idrinfo->lock); -/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc */ -WARN_ON (!IS_ERR (idr_replace (&idrinfo->action_idr, a, a->tcfa_index))); -mutex_unlock (&idrinfo->lock); -} -EXPORT_SYMBOL (tcf_idr_insert); -/* Cleanup idr index that was allocated but not initialized. */ void tcf_idr_cleanup (struct tc_action_net *tn,u32 index)
@@ -902,6 +891,16 @@ static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = { [TCA_ACT_HW_STATS] = NLA_POLICY_BITFIELD32(TCA_ACT_HW_STATS_ANY), }; +static void tcf_idr_insert (struct tc_action *a) +{ +struct tcf_idrinfo *idrinfo = a->idrinfo; + +mutex_lock (&idrinfo->lock); +/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc */ +WARN_ON (!IS_ERR (idr_replace (&idrinfo->action_idr, a, a->tcfa_index))); +mutex_unlock (&idrinfo->lock); +} + struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, struct nlattr *nla, struct nlattr *est, char *name, int ovr, int bind,
@@ -989,6 +988,16 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,if (err <0 ) goto err_mod; +if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + } + +if (err ==ACT_P_CREATED ) +tcf_idr_insert (a); +if (!name && tb[TCA_ACT_COOKIE ])tcf_set_action_cookie (&a->act_cookie, cookie);
@@ -1002,13 +1011,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,if (err !=ACT_P_CREATED )module_put (a_o->owner); -if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && - !rcu_access_pointer (a->goto_chain)) { -tcf_action_destroy_1 (a, bind); -NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); -return ERR_PTR (-EINVAL ); - } -return a; err_mod:
net/sched/act_bpf.c +1 -3
@@ -365,9 +365,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (res ==ACT_P_CREATED ) { -tcf_idr_insert (tn, *act); - }else { +if (res !=ACT_P_CREATED ) {/* make sure the program being replaced is no longer executing */ synchronize_rcu ();tcf_bpf_cfg_cleanup (&old);
net/sched/act_connmark.c +0 -1
@@ -139,7 +139,6 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla, ci->net = net; ci->zone = parm->zone; -tcf_idr_insert (tn, *a); ret =ACT_P_CREATED ; }else if (ret >0 ) { ci =to_connmark (*a);
net/sched/act_csum.c +0 -3
@@ -110,9 +110,6 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,if (params_new)kfree_rcu (params_new, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; put_chain:if (goto_ch)
net/sched/act_ct.c +0 -2
@@ -1297,8 +1297,6 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla,tcf_chain_put_by_act (goto_ch);if (params)call_rcu (¶ms->rcu, tcf_ct_params_free); -if (res ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return res;
net/sched/act_ctinfo.c +0 -3
@@ -269,9 +269,6 @@ static int tcf_ctinfo_init(struct net *net, struct nlattr *nla,if (cp_new)kfree_rcu (cp_new, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; put_chain:
net/sched/act_gact.c +0 -2
@@ -140,8 +140,6 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; release_idr:tcf_idr_release (*a, bind);
net/sched/act_gate.c +0 -3
@@ -437,9 +437,6 @@ static int tcf_gate_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; chain_put:
net/sched/act_ife.c +0 -3
@@ -627,9 +627,6 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,if (p)kfree_rcu (p, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; metadata_parse_err:if (goto_ch)
net/sched/act_ipt.c +0 -2
@@ -189,8 +189,6 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla, ipt->tcfi_t = t; ipt->tcfi_hook = hook;spin_unlock_bh (&ipt->tcf_lock); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; err3:
net/sched/act_mirred.c +0 -2
@@ -194,8 +194,6 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,spin_lock (&mirred_list_lock);list_add (&m->tcfm_list, &mirred_list);spin_unlock (&mirred_list_lock); - -tcf_idr_insert (tn, *a); }return ret;
net/sched/act_mpls.c +0 -2
@@ -273,8 +273,6 @@ static int tcf_mpls_init(struct net *net, struct nlattr *nla,if (p)kfree_rcu (p, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
net/sched/act_nat.c +0 -3
@@ -93,9 +93,6 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; release_idr:tcf_idr_release (*a, bind);
net/sched/act_pedit.c +0 -2
@@ -238,8 +238,6 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,spin_unlock_bh (&p->tcf_lock);if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:
net/sched/act_police.c +0 -2
@@ -201,8 +201,6 @@ static int tcf_police_init(struct net *net, struct nlattr *nla,if (new)kfree_rcu (new, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; failure:
net/sched/act_sample.c +0 -2
@@ -116,8 +116,6 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
net/sched/act_simple.c +0 -2
@@ -157,8 +157,6 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla, goto release_idr; } -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
net/sched/act_skbedit.c +0 -2
@@ -225,8 +225,6 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
net/sched/act_skbmod.c +0 -2
@@ -190,8 +190,6 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
net/sched/act_tunnel_key.c +0 -3
@@ -537,9 +537,6 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,if (goto_ch)tcf_chain_put_by_act (goto_ch); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a); -return ret; put_chain:
net/sched/act_vlan.c +0 -2
@@ -229,8 +229,6 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,if (p)kfree_rcu (p, rcu); -if (ret ==ACT_P_CREATED ) -tcf_idr_insert (tn, *a);return ret; put_chain:if (goto_ch)
Signature · 1 line
2.28.0
Re: [Patch net 1/2] net_sched: defer tcf_idr_insert() in tcf_action_init_1()
Quoted 9 lines · Cong Wang
All TC actions call
tcf_idr_insert()for new action at the end of their ->init(), so we can actually move it to a central place intcf_action_init_1().And once the action is inserted into the global IDR, other parallel process could free it immediately as its refcnt is still 1, so we can not fail after this, we need to move it after the goto action validation to avoid handling the failure case after insertion.
Quoted 8 lines
This is found during code review, is not directly triggered by syzbot. And this prepares for the next patch.
Cc Vlad Buslov <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Jiri Pirko <[email protected]>Signed-off-by Cong Wang <[email protected]>---
Hi Cong,
Thanks for fixing this!
Quoted 77 lines
include/net/act_api.h | 2 -- net/sched/act_api.c | 38 ++++++++++++++++++++------------------ net/sched/act_bpf.c | 4 +--- net/sched/act_connmark.c | 1 - net/sched/act_csum.c | 3 --- net/sched/act_ct.c | 2 -- net/sched/act_ctinfo.c | 3 --- net/sched/act_gact.c | 2 -- net/sched/act_gate.c | 3 --- net/sched/act_ife.c | 3 --- net/sched/act_ipt.c | 2 -- net/sched/act_mirred.c | 2 -- net/sched/act_mpls.c | 2 -- net/sched/act_nat.c | 3 --- net/sched/act_pedit.c | 2 -- net/sched/act_police.c | 2 -- net/sched/act_sample.c | 2 -- net/sched/act_simple.c | 2 -- net/sched/act_skbedit.c | 2 -- net/sched/act_skbmod.c | 2 -- net/sched/act_tunnel_key.c | 3 --- net/sched/act_vlan.c | 2 -- 22 files changed, 21 insertions(+), 66 deletions(-)include/net/act_api.h +0
-2@@ -166,8 +166,6 @@ int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index, struct nlattr *est, struct tc_action **a, const struct tc_action_ops *ops, int bind, u32 flags); -void tcf_idr_insert (struct tc_action_net *tn,struct tc_action *a); -void tcf_idr_cleanup (struct tc_action_net *tn,u32 index);int tcf_idr_check_alloc (struct tc_action_net *tn,u32 *index,struct tc_action **a,int bind);net/sched/act_api.c +10
-11@@ -467,17 +467,6 @@ int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index, }EXPORT_SYMBOL (tcf_idr_create_from_flags); -void tcf_idr_insert (struct tc_action_net *tn,struct tc_action *a) -{ -struct tcf_idrinfo *idrinfo = tn->idrinfo; - -mutex_lock (&idrinfo->lock); -/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc */ -WARN_ON (!IS_ERR (idr_replace (&idrinfo->action_idr, a, a->tcfa_index))); -mutex_unlock (&idrinfo->lock); -} -EXPORT_SYMBOL (tcf_idr_insert); -/* Cleanup idr index that was allocated but not initialized. */ void tcf_idr_cleanup (struct tc_action_net *tn,u32 index)@@ -902,6 +891,16 @@ static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = { [TCA_ACT_HW_STATS] = NLA_POLICY_BITFIELD32(TCA_ACT_HW_STATS_ANY), }; +static void tcf_idr_insert (struct tc_action *a) +{ +struct tcf_idrinfo *idrinfo = a->idrinfo; + +mutex_lock (&idrinfo->lock); +/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc */ +WARN_ON (!IS_ERR (idr_replace (&idrinfo->action_idr, a, a->tcfa_index))); +mutex_unlock (&idrinfo->lock); +} + struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, struct nlattr *nla, struct nlattr *est, char *name, int ovr, int bind,
net/sched/act_api.c struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, · line 996
Quoted 9 lines
net/sched/act_api.c +6
-0@@ -989,6 +988,16 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,if (err <0 ) goto err_mod; +if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + }
I don't think calling tcf_action_destoy_1() is enough here. Since you moved this block before assigning cookie and releasing the module, you also need to release them manually in addition to destroying the action instance.
Quoted 21 lines
net/sched/act_api.c +4
-7+ +if (err ==ACT_P_CREATED ) +tcf_idr_insert (a); +if (!name && tb[TCA_ACT_COOKIE ])tcf_set_action_cookie (&a->act_cookie, cookie);@@ -1002,13 +1011,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,if (err !=ACT_P_CREATED )module_put (a_o->owner); -if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && - !rcu_access_pointer (a->goto_chain)) { -tcf_action_destroy_1 (a, bind); -NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); -return ERR_PTR (-EINVAL ); - } -return a; err_mod:
[...]
Re: [Patch net 1/2] net_sched: defer tcf_idr_insert() in tcf_action_init_1()
Quoted 7 lines · Vlad Buslov
net/sched/act_api.c struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, · line 996
Quoted 6 lines
net/sched/act_api.c +6
-0+if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + }
Quoted 5 lines
I don't think calling
tcf_action_destoy_1()is enough here. Since you moved this block before assigning cookie and releasing the module, you also need to release them manually in addition to destroying the action instance.
tcf_action_destoy_1() eventually calls free_tcf() which frees cookie and tcf_action_destroy() which releases module refcnt.
What am I missing here?
Thanks.
Re: [Patch net 1/2] net_sched: defer tcf_idr_insert() in tcf_action_init_1()
Quoted 14 lines · Cong Wang
Quoted 7 lines · Vlad Buslov
net/sched/act_api.c struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, · line 996
Quoted 6 lines
net/sched/act_api.c +6
-0+if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + }Quoted 5 lines
I don't think calling
tcf_action_destoy_1()is enough here. Since you moved this block before assigning cookie and releasing the module, you also need to release them manually in addition to destroying the action instance.
Quoted 6 lines
tcf_action_destoy_1()eventually callsfree_tcf()which frees cookie andtcf_action_destroy()which releases module refcnt.What am I missing here?
Thanks.
The memory referenced by the function local pointer "cookie" hasn't been assigned yet to the a->act_cookie because in your patch you moved goto_chain validation code before the cookie change. That means that if user overwrites existing action, then action old a->act_cookie will be freed by tcf_action_destroy_1() but new cookie that was allocated by nla_memdup_cookie() will leak.
Regards,
Vlad
Re: [Patch net 1/2] net_sched: defer tcf_idr_insert() in tcf_action_init_1()
hello,
Quoted 20 lines · Vlad Buslov
Quoted 19 lines · Cong Wang
Quoted 7 lines · Vlad Buslov
net/sched/act_api.c struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, · line 996
Quoted 6 lines
net/sched/act_api.c +6
-0+if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + }Quoted 5 lines
I don't think calling
tcf_action_destoy_1()is enough here. Since you moved this block before assigning cookie and releasing the module, you also need to release them manually in addition to destroying the action instance.
tcf_action_destoy_1()eventually callsfree_tcf()which frees cookie andtcf_action_destroy()which releases module refcnt.What am I missing here?
Quoted 8 lines
Quoted 1 line
Thanks.
The memory referenced by the function local pointer "cookie" hasn't been assigned yet to the
a->act_cookiebecause in your patch you movedgoto_chainvalidation code before the cookie change. That means that if user overwrites existing action, then action olda->act_cookiewill be freed bytcf_action_destroy_1()but new cookie that was allocated bynla_memdup_cookie()will leak.
maybe we can just delete this if (TC_ACT_EXT_CMP(...)) { ... } statement, instead of moving it? Each TC action already does the check for NULL "goto chains" with a_o->init() -> tcf_action_check_ctrlact(), so this if () statement looks dead code to me _ I probably forgot to remove it after all actions were converted to validate the control action inside their .init() function.
Signature · 1 line
davide
Re: [Patch net 1/2] net_sched: defer tcf_idr_insert() in tcf_action_init_1()
Quoted 32 lines · Davide Caratti
hello,
Quoted 28 lines · Vlad Buslov
Quoted 14 lines · Cong Wang
Quoted 7 lines · Vlad Buslov
net/sched/act_api.c struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, · line 996
Quoted 6 lines
net/sched/act_api.c +6
-0+if (TC_ACT_EXT_CMP (a->tcfa_action,TC_ACT_GOTO_CHAIN ) && + !rcu_access_pointer (a->goto_chain)) { +tcf_action_destroy_1 (a, bind); +NL_SET_ERR_MSG (extack,"can't use goto chain with NULL chain" ); +return ERR_PTR (-EINVAL ); + }Quoted 5 lines
I don't think calling
tcf_action_destoy_1()is enough here. Since you moved this block before assigning cookie and releasing the module, you also need to release them manually in addition to destroying the action instance.Quoted 6 lines
tcf_action_destoy_1()eventually callsfree_tcf()which frees cookie andtcf_action_destroy()which releases module refcnt.What am I missing here?
Thanks.
The memory referenced by the function local pointer "cookie" hasn't been assigned yet to the
a->act_cookiebecause in your patch you movedgoto_chainvalidation code before the cookie change. That means that if user overwrites existing action, then action olda->act_cookiewill be freed bytcf_action_destroy_1()but new cookie that was allocated bynla_memdup_cookie()will leak.
Yes, good catch!
Quoted 7 lines
maybe we can just delete this if (
TC_ACT_EXT_CMP(...)) { ... } statement, instead of moving it? Each TC action already does the check for NULL "goto chains" witha_o->init()->tcf_action_check_ctrlact(), so this if () statement looks dead code to me _ I probably forgot to remove it after all actions were converted to validate the control action inside their .init() function.
Good point, I think you are right, I will send a patch to remove it.
Thanks!
PATCH 2/2 net_sched: commit action insertions together
In reply to Cong Wangsyzbot is able to trigger a failure case inside the loop in tcf_action_init(), and when this happens we clean up with tcf_action_destroy(). But, as these actions are already inserted into the global IDR, other parallel process could free them before tcf_action_destroy(), then we will trigger a use-after-free.
Fix this by deferring the insertions even later, after the loop, and committing all the insertions in a separate loop, so we will never fail in the middle of the insertions any more.
One side effect is that the window between alloction and final insertion becomes larger, now it is more likely that the loop in tcf_del_walker() sees the placeholder -EBUSY pointer. So we have to check for error pointer in tcf_del_walker().
--- net/sched/act_api.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
net/sched/act_api.c +23 -9
@@ -307,6 +307,8 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,mutex_lock (&idrinfo->lock);idr_for_each_entry_ul (idr, p, tmp, id) { +if (IS_ERR (p)) +continue ; ret =tcf_idr_release_unsafe (p);if (ret ==ACT_P_DELETED ) {module_put (ops->owner);
@@ -891,14 +893,24 @@ static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = { [TCA_ACT_HW_STATS] = NLA_POLICY_BITFIELD32(TCA_ACT_HW_STATS_ANY), }; -static void tcf_idr_insert (struct tc_action *a) +static void tcf_idr_insert_many (struct tc_action *actions[]) { -struct tcf_idrinfo *idrinfo = a->idrinfo; +int i; -mutex_lock (&idrinfo->lock); -/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc */ -WARN_ON (!IS_ERR (idr_replace (&idrinfo->action_idr, a, a->tcfa_index))); -mutex_unlock (&idrinfo->lock); +for (i =0 ; i <TCA_ACT_MAX_PRIO ; i++) { +struct tc_action *a = actions[i]; +struct tcf_idrinfo *idrinfo; + +if (!a) +continue ; + idrinfo = a->idrinfo; +mutex_lock (&idrinfo->lock); +/* Replace ERR_PTR(-EBUSY) allocated by tcf_idr_check_alloc if +* it is just created, otherwise this is just a nop. +*/ +idr_replace (&idrinfo->action_idr, a, a->tcfa_index); +mutex_unlock (&idrinfo->lock); + } } struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
@@ -995,9 +1007,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,return ERR_PTR (-EINVAL ); } -if (err ==ACT_P_CREATED ) -tcf_idr_insert (a); -if (!name && tb[TCA_ACT_COOKIE ])tcf_set_action_cookie (&a->act_cookie, cookie);
@@ -1053,6 +1062,11 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla, actions[i -1 ] = act; } +/* We have to commit them all together, because if any error happened in +* between, we could not handle the failure gracefully. +*/ +tcf_idr_insert_many (actions); + *attr_size =tcf_action_full_attrs_size (sz);return i -1 ;
Signature · 1 line
2.28.0
Re: [Patch net 2/2] net_sched: commit action insertions together
Quoted 15 lines · Cong Wang
syzbot is able to trigger a failure case inside the loop in
tcf_action_init(), and when this happens we clean up withtcf_action_destroy(). But, as these actions are already inserted into the global IDR, other parallel process could free them beforetcf_action_destroy(), then we will trigger a use-after-free.Fix this by deferring the insertions even later, after the loop, and committing all the insertions in a separate loop, so we will never fail in the middle of the insertions any more.
One side effect is that the window between alloction and final insertion becomes larger, now it is more likely that the loop in
tcf_del_walker()sees the placeholder-EBUSYpointer. So we have to check for error pointer intcf_del_walker().
Quoted 7 lines
Reported-and-tested-by [email protected]Fixes 0190c1d452a9 ("net: sched: atomically check-allocate action")Cc Vlad Buslov <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Jiri Pirko <[email protected]>Signed-off-by Cong Wang <[email protected]>---
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Tue, 22 Sep 2020 20:56:22 -0700
Quoted 2 lines
This patchset fixes a use-after-free triggered by syzbot. Please find more details in each patch description.
Series applied and queued up for -stable, thanks Cong.