summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGuillaume Nault <gnault@redhat.com>2020-10-20 17:34:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 10:10:55 +0100
commita9cee4ed5a6abb04d45ae6ba0d65448671671727 (patch)
treeefd78c8acb1e171523b6a25d7211ec1ed11d99d3 /net
parent77827f3d7d4de6d45f345da2b862038ad67eca6a (diff)
downloadlinux-stable-a9cee4ed5a6abb04d45ae6ba0d65448671671727.tar.gz
linux-stable-a9cee4ed5a6abb04d45ae6ba0d65448671671727.tar.bz2
linux-stable-a9cee4ed5a6abb04d45ae6ba0d65448671671727.zip
net/sched: act_gate: Unlock ->tcfa_lock in tc_setup_flow_action()
[ Upstream commit b130762161374b1ef31549bef8ebd4abeb998d94 ] We need to jump to the "err_out_locked" label when tcf_gate_get_entries() fails. Otherwise, tc_setup_flow_action() exits with ->tcfa_lock still held. Fixes: d29bdd69ecdd ("net: schedule: add action gate offloading") Signed-off-by: Guillaume Nault <gnault@redhat.com> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Link: https://lore.kernel.org/r/12f60e385584c52c22863701c0185e40ab08a7a7.1603207948.git.gnault@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/sched/cls_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 41a55c6cbeb8..faeabff283a2 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3712,7 +3712,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
entry->gate.num_entries = tcf_gate_num_entries(act);
err = tcf_gate_get_entries(entry, act);
if (err)
- goto err_out;
+ goto err_out_locked;
} else {
err = -EOPNOTSUPP;
goto err_out_locked;