diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2019-10-04 15:07:09 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2019-10-30 08:45:57 -0700 |
| commit | a60a5746004d7dbb68cbccd4c16d0529e2b2d1d9 (patch) | |
| tree | a98e2179e735ebc2f18e9ad7a728833c2ef46eba /security/safesetid | |
| parent | 445d3749315f34229dcfc3efd82796f97fc72e92 (diff) | |
| download | blackbird-op-linux-a60a5746004d7dbb68cbccd4c16d0529e2b2d1d9.tar.gz blackbird-op-linux-a60a5746004d7dbb68cbccd4c16d0529e2b2d1d9.zip | |
security/safesetid: Replace rcu_swap_protected() with rcu_replace_pointer()
This commit replaces the use of rcu_swap_protected() with the more
intuitively appealing rcu_replace_pointer() as a step towards removing
rcu_swap_protected().
Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: Reported-by: kbuild test robot <lkp@intel.com>
[ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ]
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Micah Morton <mortonm@chromium.org>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: <linux-security-module@vger.kernel.org>
Diffstat (limited to 'security/safesetid')
| -rw-r--r-- | security/safesetid/securityfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/safesetid/securityfs.c b/security/safesetid/securityfs.c index 74a13d432ed8..f8bc574cea9c 100644 --- a/security/safesetid/securityfs.c +++ b/security/safesetid/securityfs.c @@ -179,8 +179,8 @@ out_free_rule: * doesn't currently exist, just use a spinlock for now. */ mutex_lock(&policy_update_lock); - rcu_swap_protected(safesetid_setuid_rules, pol, - lockdep_is_held(&policy_update_lock)); + pol = rcu_replace_pointer(safesetid_setuid_rules, pol, + lockdep_is_held(&policy_update_lock)); mutex_unlock(&policy_update_lock); err = len; |
