diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2020-02-04 11:10:12 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-11 04:34:15 -0800 |
| commit | 7b3dbf958a1a6ec9e2ef0d3dd58cf0f7964ca8ba (patch) | |
| tree | 7feb876d99bf129d27b5b0f0d8082a36dc22d282 /net | |
| parent | af746042b58d7b06ee910dec48fdb196b60d6180 (diff) | |
| download | linux-stable-7b3dbf958a1a6ec9e2ef0d3dd58cf0f7964ca8ba.tar.gz linux-stable-7b3dbf958a1a6ec9e2ef0d3dd58cf0f7964ca8ba.tar.bz2 linux-stable-7b3dbf958a1a6ec9e2ef0d3dd58cf0f7964ca8ba.zip | |
net_sched: fix a resource leak in tcindex_set_parms()
[ Upstream commit 52b5ae501c045010aeeb1d5ac0373ff161a88291 ]
Jakub noticed there is a potential resource leak in
tcindex_set_parms(): when tcindex_filter_result_init() fails
and it jumps to 'errout1' which doesn't release the memory
and resources allocated by tcindex_alloc_perfect_hash().
We should just jump to 'errout_alloc' which calls
tcindex_free_perfect_hash().
Fixes: b9a24bb76bf6 ("net_sched: properly handle failure case of tcf_exts_init()")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/cls_tcindex.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c index ff4e48e5d738..db4b5d9ffaf7 100644 --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c @@ -365,7 +365,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, err = tcindex_filter_result_init(&new_filter_result); if (err < 0) - goto errout1; + goto errout_alloc; if (old_r) cr = r->res; @@ -484,7 +484,6 @@ errout_alloc: tcindex_free_perfect_hash(cp); else if (balloc == 2) kfree(cp->h); -errout1: tcf_exts_destroy(&new_filter_result.exts); errout: kfree(cp); |