From: Dan Carpenter <dan.carpenter@linaro.org>
To: Tycho Andersen <tandersen@netflix.com>
Cc: Kees Cook <kees@kernel.org>,
Eric Biederman <ebiederm@xmission.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH next] exec: Fix a NULL vs IS_ERR() test in bprm_add_fixup_comm()
Date: Sat, 2 Nov 2024 12:31:14 +0300 [thread overview]
Message-ID: <18f60cb9-f0f7-484c-8828-77bd5e6aac59@stanley.mountain> (raw)
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(-)
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)
--
2.45.2
next reply other threads:[~2024-11-02 9:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-02 9:31 Dan Carpenter [this message]
2024-11-02 19:57 ` Kees Cook
2024-11-03 22:52 ` Tycho Andersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18f60cb9-f0f7-484c-8828-77bd5e6aac59@stanley.mountain \
--to=dan.carpenter@linaro.org \
--cc=brauner@kernel.org \
--cc=ebiederm@xmission.com \
--cc=jack@suse.cz \
--cc=kees@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tandersen@netflix.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox