From: Azeem Shaikh <azeemshaikh38@gmail.com>
To: Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>,
Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: linux-hardening@vger.kernel.org,
Azeem Shaikh <azeemshaikh38@gmail.com>,
ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org,
Christian Brauner <brauner@kernel.org>,
Dave Chinner <dchinner@redhat.com>,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 2/2] ocfs2: Replace strlcpy with strscpy
Date: Wed, 30 Aug 2023 21:54:26 +0000 [thread overview]
Message-ID: <20230830215426.4181755-3-azeemshaikh38@gmail.com> (raw)
In-Reply-To: <20230830215426.4181755-1-azeemshaikh38@gmail.com>
strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().
Direct replacement is assumed to be safe here since
it's ok for `kernel_param_ops.get()` to return -errno [3].
This changes the behavior such that instead of silently ignoring the
case when sizeof(@buffer) < DLMFS_CAPABILITIES, we now return error.
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
[3] https://elixir.bootlin.com/linux/v6.5/source/include/linux/moduleparam.h#L52
Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
---
fs/ocfs2/dlmfs/dlmfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 33e529de93b2..b001eccdd2f3 100644
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -80,7 +80,7 @@ static int param_set_dlmfs_capabilities(const char *val,
static int param_get_dlmfs_capabilities(char *buffer,
const struct kernel_param *kp)
{
- return strlcpy(buffer, DLMFS_CAPABILITIES,
+ return strscpy(buffer, DLMFS_CAPABILITIES,
strlen(DLMFS_CAPABILITIES) + 1);
}
static const struct kernel_param_ops dlmfs_capabilities_ops = {
--
2.42.0.283.g2d96d420d3-goog
next prev parent reply other threads:[~2023-08-30 21:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 21:54 [PATCH 0/2] ocfs2: Replace strlcpy with strscpy Azeem Shaikh
2023-08-30 21:54 ` [PATCH 1/2] ocfs2: Replace module_param_call with module_param_cb Azeem Shaikh
2023-08-30 23:00 ` Kees Cook
2023-08-30 21:54 ` Azeem Shaikh [this message]
2023-08-30 22:17 ` [PATCH 2/2] ocfs2: Replace strlcpy with strscpy Justin Stitt
2023-08-30 23:06 ` Kees Cook
2023-08-31 19:28 ` Azeem Shaikh
2023-08-31 21:04 ` Kees Cook
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=20230830215426.4181755-3-azeemshaikh38@gmail.com \
--to=azeemshaikh38@gmail.com \
--cc=brauner@kernel.org \
--cc=dchinner@redhat.com \
--cc=jlayton@kernel.org \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@lists.linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).