Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8225d385 authored by Pranith Kumar's avatar Pranith Kumar Committed by Kees Cook
Browse files

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: default avatarPranith Kumar <bobby.prani@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent b3bddffd

kernel/seccomp.c

+3 −4
Original line number Diff line number Diff line
@@ -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;