Commit dd4be396 authored May 30, 2018 by Paul Blakey Committed by Greg Kroah-Hartman Jun 11, 2018

cls_flower: Fix incorrect idr release when failing to modify rule



[ Upstream commit 8258d2da9f9f521dce7019e018360c28d116354e ]

When we fail to modify a rule, we incorrectly release the idr handle
of the unmodified old rule.

Fix that by checking if we need to release it.

Fixes: fe2502e4 ("net_sched: remove cls_flower idr on failure")
Reported-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c931c9ae

net/sched/cls_flower.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1007,7 +1007,7 @@ static int fl_change(struct net net, struct sk_buff in_skb,
		return 0;

		errout_idr:
		if (fnew->handle)
		if (!fold)
		idr_remove_ext(&head->handle_idr, fnew->handle);
		errout:
		tcf_exts_destroy(&fnew->exts);