diff options
author | 2019-03-02 12:54:35 -0800 | |
---|---|---|
committer | 2019-03-02 12:54:35 -0800 | |
commit | 9eb359140cd307f8a14f61c19b155ffca5291057 (patch) | |
tree | 22d5143608ef1744ca4b7025414777defe8bcca5 /net/sched/act_skbedit.c | |
parent | Merge tag 'wireless-drivers-next-for-davem-2019-03-01' of git://git.kernel.or... (diff) | |
parent | net: sit: fix memory leak in sit_init_net() (diff) | |
download | linux-9eb359140cd307f8a14f61c19b155ffca5291057.tar.gz linux-9eb359140cd307f8a14f61c19b155ffca5291057.tar.bz2 linux-9eb359140cd307f8a14f61c19b155ffca5291057.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sched/act_skbedit.c')
-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 39f8a67ea940..65879500b688 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -189,8 +189,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; } |