| Message ID | 18f60cb9-f0f7-484c-8828-77bd5e6aac59@stanley.mountain (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [next] exec: Fix a NULL vs IS_ERR() test in bprm_add_fixup_comm() | expand |
On Sat, 02 Nov 2024 12:31:14 +0300, Dan Carpenter wrote: > The strndup_user() function doesn't return NULL, it returns error > pointers. Fix the check to match. > > Applied to for-next/execve, thanks! [1/1] exec: Fix a NULL vs IS_ERR() test in bprm_add_fixup_comm() https://git.kernel.org/kees/c/05e60502723d Take care,
On Sat, Nov 2, 2024 at 3:31 AM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The strndup_user() function doesn't return NULL, it returns error > pointers. Fix the check to match. > > Fixes: 7bdc6fc85c9a ("exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Oof, thanks. Reviewed-by: Tycho Andersen <tandersen@netflix.com>
diff --git a/fs/exec.c b/fs/exec.c index 7e24d585915e..c5c291502dca 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1512,10 +1512,10 @@ static int bprm_add_fixup_comm(struct linux_binprm *bprm, return 0; bprm->argv0 = strndup_user(p, MAX_ARG_STRLEN); - if (bprm->argv0) - return 0; + if (IS_ERR(bprm->argv0)) + return PTR_ERR(bprm->argv0); - return -EFAULT; + return 0; } static struct linux_binprm *alloc_bprm(int fd, struct filename *filename, int flags)
The strndup_user() function doesn't return NULL, it returns error pointers. Fix the check to match. Fixes: 7bdc6fc85c9a ("exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- fs/exec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)