seccomp: remove unnecessary unlikely()

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

Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: linux-security-module@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: James Morris <james.morris@microsoft.com>

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index fd023ac24e10ea16dde538a4a3274387e9b7df8d..5a2a9af4663e2a0f1ed0bbf7e45e4abbf6904e7d 100644 (file)
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -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;
        }