|
Thomas Bogendoerfer |
9f4aec |
From: Jiri Pirko <jiri@mellanox.com>
|
|
Thomas Bogendoerfer |
9f4aec |
Date: Sat, 20 May 2017 15:01:31 +0200
|
|
Thomas Bogendoerfer |
9f4aec |
Subject: net/sched: properly assign RCU pointer in tcf_chain_tp_insert/remove
|
|
Thomas Bogendoerfer |
9f4aec |
Patch-mainline: v4.13-rc1
|
|
Thomas Bogendoerfer |
9f4aec |
Git-commit: 31efcc250a1dea96edca6595a9639d898cf99ae5
|
|
Thomas Bogendoerfer |
9f4aec |
References: bsc#1056787
|
|
Thomas Bogendoerfer |
9f4aec |
|
|
Thomas Bogendoerfer |
9f4aec |
*p_filter_chain is rcu-dereferenced on reader path. So here in writer,
|
|
Thomas Bogendoerfer |
9f4aec |
property assign the pointer.
|
|
Thomas Bogendoerfer |
9f4aec |
|
|
Thomas Bogendoerfer |
9f4aec |
Fixes: 2190d1d0944f ("net: sched: introduce helpers to work with filter chains")
|
|
Thomas Bogendoerfer |
9f4aec |
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
|
|
Thomas Bogendoerfer |
9f4aec |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Thomas Bogendoerfer |
9f4aec |
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
|
|
Thomas Bogendoerfer |
9f4aec |
---
|
|
Thomas Bogendoerfer |
9f4aec |
net/sched/cls_api.c | 4 ++--
|
|
Thomas Bogendoerfer |
9f4aec |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Thomas Bogendoerfer |
9f4aec |
|
|
Thomas Bogendoerfer |
9f4aec |
--- a/net/sched/cls_api.c
|
|
Thomas Bogendoerfer |
9f4aec |
+++ b/net/sched/cls_api.c
|
|
Thomas Bogendoerfer |
9f4aec |
@@ -351,7 +351,7 @@ static void tcf_chain_tp_insert(struct t
|
|
Thomas Bogendoerfer |
9f4aec |
{
|
|
Thomas Bogendoerfer |
9f4aec |
if (chain->p_filter_chain &&
|
|
Thomas Bogendoerfer |
9f4aec |
*chain_info->pprev == chain->filter_chain)
|
|
Thomas Bogendoerfer |
9f4aec |
- *chain->p_filter_chain = tp;
|
|
Thomas Bogendoerfer |
9f4aec |
+ rcu_assign_pointer(*chain->p_filter_chain, tp);
|
|
Thomas Bogendoerfer |
9f4aec |
RCU_INIT_POINTER(tp->next, tcf_chain_tp_prev(chain_info));
|
|
Thomas Bogendoerfer |
9f4aec |
rcu_assign_pointer(*chain_info->pprev, tp);
|
|
Thomas Bogendoerfer |
9f4aec |
}
|
|
Thomas Bogendoerfer |
9f4aec |
@@ -363,7 +363,7 @@ static void tcf_chain_tp_remove(struct t
|
|
Thomas Bogendoerfer |
9f4aec |
struct tcf_proto *next = rtnl_dereference(chain_info->next);
|
|
Thomas Bogendoerfer |
9f4aec |
|
|
Thomas Bogendoerfer |
9f4aec |
if (chain->p_filter_chain && tp == chain->filter_chain)
|
|
Thomas Bogendoerfer |
9f4aec |
- *chain->p_filter_chain = next;
|
|
Thomas Bogendoerfer |
9f4aec |
+ RCU_INIT_POINTER(*chain->p_filter_chain, next);
|
|
Thomas Bogendoerfer |
9f4aec |
RCU_INIT_POINTER(*chain_info->pprev, next);
|
|
Thomas Bogendoerfer |
9f4aec |
}
|
|
Thomas Bogendoerfer |
9f4aec |
|