Messages in this thread | | | From | Kees Cook <> | Date | Sun, 2 Sep 2018 14:26:57 -0700 | Subject | Re: [PATCH 07/23] seccomp: remove unnecessary unlikely() |
| |
On Thu, Aug 30, 2018 at 3:34 PM, Igor Stoppa <igor.stoppa@gmail.com> wrote: > 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> > Cc: Kees Cook <keescook@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>
-Kees
> --- > kernel/seccomp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > index fd023ac24e10..5a2a9af4663e 100644 > --- 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; > } > -- > 2.17.1 >
-- Kees Cook Pixel Security
| |