Commit 80532384 authored Sep 06, 2017 by Jiri Pirko Committed by David S. Miller Sep 07, 2017

net: sched: fix memleak for chain zero

There's a memleak happening for chain 0. The thing is, chain 0 needs to
be always present, not created on demand. Therefore tcf_block_get upon
creation of block calls the tcf_chain_create function directly. The
chain is created with refcnt == 1, which is not correct in this case and
causes the memleak. So move the refcnt increment into tcf_chain_get
function even for the case when chain needs to be created.

Reported-by: Jakub Kicinski <kubakici@wp.pl>
Fixes: 5bc17018 ("net: sched: introduce multichain support for filters")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Tested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0f2be423

net/sched/cls_api.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ static struct tcf_chain tcf_chain_create(struct tcf_block block,
		list_add_tail(&chain->list, &block->chain_list);
		chain->block = block;
		chain->index = chain_index;
		chain->refcnt = 1;
		chain->refcnt = 0;
		return chain;
		}

		@@ -217,16 +217,16 @@ struct tcf_chain tcf_chain_get(struct tcf_block block, u32 chain_index,
		struct tcf_chain *chain;

		list_for_each_entry(chain, &block->chain_list, list) {
		if (chain->index == chain_index) {
		if (chain->index == chain_index)
		goto incref;
		}
		chain = create ? tcf_chain_create(block, chain_index) : NULL;

		incref:
		if (chain)
		chain->refcnt++;
		return chain;
		}
		}
		if (create)
		return tcf_chain_create(block, chain_index);
		else
		return NULL;
		}
		EXPORT_SYMBOL(tcf_chain_get);

		void tcf_chain_put(struct tcf_chain *chain)

Admin message