summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPranith Kumar <bobby.prani@gmail.com>2014-11-21 10:06:01 -0500
committerKees Cook <keescook@chromium.org>2015-07-15 11:52:51 -0700
commit8225d3853f34f6cf9caff15d8c385a528e0d7cb1 (patch)
treed5c5bab01da12dabd6b4b2c04554dab55ac85009 /kernel
parentb3bddffd35a0b77eee89760eb94cafa18dc431f5 (diff)
downloadlinux-stable-8225d3853f34f6cf9caff15d8c385a528e0d7cb1.tar.gz
linux-stable-8225d3853f34f6cf9caff15d8c385a528e0d7cb1.tar.bz2
linux-stable-8225d3853f34f6cf9caff15d8c385a528e0d7cb1.zip
seccomp: Replace smp_read_barrier_depends() with lockless_dereference()
Recently lockless_dereference() was added which can be used in place of hard-coding smp_read_barrier_depends(). The following PATCH makes the change. Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/seccomp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 4f44028943e6..980fd26da22e 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -175,17 +175,16 @@ static int seccomp_check_filter(struct sock_filter *filter, unsigned int flen)
*/
static u32 seccomp_run_filters(struct seccomp_data *sd)
{
- struct seccomp_filter *f = ACCESS_ONCE(current->seccomp.filter);
struct seccomp_data sd_local;
u32 ret = SECCOMP_RET_ALLOW;
+ /* Make sure cross-thread synced filter points somewhere sane. */
+ struct seccomp_filter *f =
+ lockless_dereference(current->seccomp.filter);
/* Ensure unexpected behavior doesn't result in failing open. */
if (unlikely(WARN_ON(f == NULL)))
return SECCOMP_RET_KILL;
- /* Make sure cross-thread synced filter points somewhere sane. */
- smp_read_barrier_depends();
-
if (!sd) {
populate_seccomp_data(&sd_local);
sd = &sd_local;