mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
net/sched: cls_u32: Fix reference counter leak leading to overflow
[ Upstream commit04c55383fa
] In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'. In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time. This issue was caught with KASAN. Fixes:705c709126
("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct") Suggested-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Lee Jones <lee@kernel.org> Reviewed-by: Eric Dumazet <edumazet@google.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c9411f014e
commit
07f9cc229b
1 changed files with 10 additions and 8 deletions
|
@ -716,13 +716,19 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
|
|||
struct nlattr *est, u32 flags, u32 fl_flags,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
int err;
|
||||
int err, ifindex = -1;
|
||||
|
||||
err = tcf_exts_validate_ex(net, tp, tb, est, &n->exts, flags,
|
||||
fl_flags, extack);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
if (tb[TCA_U32_INDEV]) {
|
||||
ifindex = tcf_change_indev(net, tb[TCA_U32_INDEV], extack);
|
||||
if (ifindex < 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (tb[TCA_U32_LINK]) {
|
||||
u32 handle = nla_get_u32(tb[TCA_U32_LINK]);
|
||||
struct tc_u_hnode *ht_down = NULL, *ht_old;
|
||||
|
@ -757,13 +763,9 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
|
|||
tcf_bind_filter(tp, &n->res, base);
|
||||
}
|
||||
|
||||
if (tb[TCA_U32_INDEV]) {
|
||||
int ret;
|
||||
ret = tcf_change_indev(net, tb[TCA_U32_INDEV], extack);
|
||||
if (ret < 0)
|
||||
return -EINVAL;
|
||||
n->ifindex = ret;
|
||||
}
|
||||
if (ifindex >= 0)
|
||||
n->ifindex = ifindex;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue