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

Commit 0d42d73a authored by Igor Stoppa's avatar Igor Stoppa Committed by James Morris
Browse files

seccomp: remove unnecessary unlikely() 



WARN_ON() already contains an unlikely(), so it's not necessary to wrap it
into another.

Signed-off-by: default avatarIgor Stoppa <igor.stoppa@huawei.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Cc: linux-security-module@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarJames Morris <james.morris@microsoft.com>
parent dbdb75bd

kernel/seccomp.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static u32 seccomp_run_filters(const struct seccomp_data *sd, 
			READ_ONCE(current->seccomp.filter);



	/* Ensure unexpected behavior doesn't result in failing open. */

	if (unlikely(WARN_ON(f == NULL)))

	if (WARN_ON(f == NULL))

		return SECCOMP_RET_KILL_PROCESS;



	if (!sd) {
@@ -297,7 +297,7 @@ static inline pid_t seccomp_can_sync_threads(void) 
		/* Return the first thread that cannot be synchronized. */

		failed = task_pid_vnr(thread);

		/* If the pid cannot be resolved, then return -ESRCH */

		if (unlikely(WARN_ON(failed == 0)))

		if (WARN_ON(failed == 0))

			failed = -ESRCH;

		return failed;

	}