diff options
| author | Paul Blakey <paulb@mellanox.com> | 2018-05-30 10:29:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-31 21:18:44 +0200 |
| commit | 8258d2da9f9f521dce7019e018360c28d116354e (patch) | |
| tree | 7b7e7a59b441da96e0f7b10bb281006d85a76ded /net/sched/cls_flower.c | |
| parent | net/sonic: Use dma_mapping_error() (diff) | |
| download | linux-8258d2da9f9f521dce7019e018360c28d116354e.tar.xz linux-8258d2da9f9f521dce7019e018360c28d116354e.zip | |
cls_flower: Fix incorrect idr release when failing to modify rule
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: fe2502e49b58 ("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>
Diffstat (limited to 'net/sched/cls_flower.c')
| -rw-r--r-- | net/sched/cls_flower.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index d964e60c730e..c79f6e71512e 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -977,7 +977,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, return 0; errout_idr: - if (fnew->handle) + if (!fold) idr_remove(&head->handle_idr, fnew->handle); errout: tcf_exts_destroy(&fnew->exts); |