commit f8b074bfda9d5a6eb136c60950a3319de5e14933
author Robert Sesek <rsesek@google.com> Mon Aug 18 19:14:51 2014 -0400
committer flintman <flintman@flintmancomputers.com> Mon Apr 27 08:05:00 2015 -0400
tree 8deca0200cd359b0f265dd1d8ebc30a20dd6bd6b
parent d32af365698237c84e6afb44d9e88d3b7bf56913

seccomp: Use atomic operations that are present in kernel 3.4.

Signed-off-by: Robert Sesek <rsesek@google.com>

kernel/seccomp.c

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index e35c742..829a2ca 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -245,7 +245,7 @@
 	 * Make sure TIF_SECCOMP cannot be set before the mode (and
 	 * filter) is set.
 	 */
-	smp_mb__before_atomic();
+	smp_mb();
 	set_tsk_thread_flag(task, TIF_SECCOMP);
 }
 
@@ -335,8 +335,8 @@
 		 * allows a put before the assignment.)
 		 */
 		put_seccomp_filter(thread);
-		smp_store_release(&thread->seccomp.filter,
-				  caller->seccomp.filter);
+		smp_mb();
+		ACCESS_ONCE(thread->seccomp.filter) = caller->seccomp.filter;
 		/*
 		 * Opt the other thread into seccomp if needed.
 		 * As threads are considered to be trust-realm