diff options
| author | Davide Caratti | 2019-02-22 12:33:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-03-10 07:17:20 +0100 |
| commit | 69e6fb1804cf679457d384e1bfc519a1f1da9553 (patch) | |
| tree | 77228c4003acd95dd0a3ae26a1d79493573dafe6 /net/sched | |
| parent | net/sched: act_ipt: fix refcount leak when replace fails (diff) | |
| download | kernel-qcow2-linux-69e6fb1804cf679457d384e1bfc519a1f1da9553.tar.gz kernel-qcow2-linux-69e6fb1804cf679457d384e1bfc519a1f1da9553.tar.xz kernel-qcow2-linux-69e6fb1804cf679457d384e1bfc519a1f1da9553.zip | |
net/sched: act_skbedit: fix refcount leak when replace fails
[ Upstream commit 6191da98062d25276a3b88fb2a94dcbcfb3ea65d ]
when act_skbedit was converted to use RCU in the data plane, we added an
error path, but we forgot to drop the action refcount in case of failure
during a 'replace' operation:
# tc actions add action skbedit ptype otherhost pass index 100
# tc action show action skbedit
total acts 1
action order 0: skbedit ptype otherhost pass
index 100 ref 1 bind 0
# tc actions replace action skbedit ptype otherhost drop index 100
RTNETLINK answers: Cannot allocate memory
We have an error talking to the kernel
# tc action show action skbedit
total acts 1
action order 0: skbedit ptype otherhost pass
index 100 ref 2 bind 0
Ensure we call tcf_idr_release(), in case 'params_new' allocation failed,
also when the action is being replaced.
Fixes: c749cdda9089 ("net/sched: act_skbedit: don't use spinlock in the data path")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_skbedit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 73e44ce2a883..86d90fc5e97e 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -191,8 +191,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, params_new = kzalloc(sizeof(*params_new), GFP_KERNEL); if (unlikely(!params_new)) { - if (ret == ACT_P_CREATED) - tcf_idr_release(*a, bind); + tcf_idr_release(*a, bind); return -ENOMEM; } |