]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net/sched: act_sample: Fix error path in init
authorYotam Gigi <yotamg@mellanox.com>
Tue, 31 Jan 2017 09:33:53 +0000 (11:33 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Feb 2017 19:10:03 +0000 (14:10 -0500)
Fix error path of in sample init, by releasing the tc hash in case of
failure in psample_group creation.

Fixes: 5c5670fae430 ("net/sched: Introduce sample tc action")
Reported-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Yotam Gigi <yotamg@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/act_sample.c

index 39229756de07231d9d90e53f0735ac8d55bc037a..02b67495829caac2b333b03d198411b598e75a6a 100644 (file)
@@ -81,8 +81,11 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
        s->rate = nla_get_u32(tb[TCA_SAMPLE_RATE]);
        s->psample_group_num = nla_get_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP]);
        psample_group = psample_group_get(net, s->psample_group_num);
-       if (!psample_group)
+       if (!psample_group) {
+               if (ret == ACT_P_CREATED)
+                       tcf_hash_release(*a, bind);
                return -ENOMEM;
+       }
        RCU_INIT_POINTER(s->psample_group, psample_group);
 
        if (tb[TCA_SAMPLE_TRUNC_SIZE]) {