UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Igor Stoppa 2018-09-05 23:34:43 +03:00 committed by James Morris
parent dbdb75bd08
commit 0d42d73a37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/seccomp.c
View File

@ -195,7 +195,7 @@ static u32 seccomp_run_filters(const struct seccomp_data *sd,
READ_ONCE(current->seccomp.filter); READ_ONCE(current->seccomp.filter);
/* Ensure unexpected behavior doesn't result in failing open. */ /* 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; return SECCOMP_RET_KILL_PROCESS;
if (!sd) { if (!sd) {
@ -297,7 +297,7 @@ static inline pid_t seccomp_can_sync_threads(void)
/* Return the first thread that cannot be synchronized. */ /* Return the first thread that cannot be synchronized. */
failed = task_pid_vnr(thread); failed = task_pid_vnr(thread);
/* If the pid cannot be resolved, then return -ESRCH */ /* If the pid cannot be resolved, then return -ESRCH */
if (unlikely(WARN_ON(failed == 0))) if (WARN_ON(failed == 0))
failed = -ESRCH; failed = -ESRCH;
return failed; return failed;
} }