Commit cadb9c9f authored Jan 31, 2017 by Yotam Gigi Committed by David S. Miller Feb 01, 2017

net/sched: act_sample: Fix error path in init



Fix error path of in sample init, by releasing the tc hash in case of
failure in psample_group creation.

Fixes: 5c5670fa ("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>

parent 6107dbdb

net/sched/act_sample.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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]) {