From: Azeem Shaikh <azeemshaikh38@gmail.com>
To: Kees Cook <keescook@chromium.org>
Cc: linux-hardening@vger.kernel.org,
"Azeem Shaikh" <azeemshaikh38@gmail.com>,
linux-kernel@vger.kernel.org,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Zhen Lei" <thunder.leizhen@huawei.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Alan Maguire" <alan.maguire@oracle.com>,
"Maninder Singh" <maninder1.s@samsung.com>,
"Rasmus Villemoes" <linux@rasmusvillemoes.dk>,
"Miroslav Benes" <mbenes@suse.cz>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Christian König" <christian.koenig@amd.com>,
"Thomas Weißschuh" <linux@weissschuh.net>,
"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
bpf@vger.kernel.org
Subject: [PATCH] kallsyms: Replace all non-returning strlcpy with strscpy
Date: Wed, 14 Jun 2023 01:03:54 +0000 [thread overview]
Message-ID: <20230614010354.1026096-1-azeemshaikh38@gmail.com> (raw)
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().
No return values were used, so direct replacement is safe.
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
---
kernel/kallsyms.c | 4 ++--
kernel/params.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 0f82c3d5a57d..7982cc9d497c 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -667,7 +667,7 @@ static int get_ksymbol_bpf(struct kallsym_iter *iter)
{
int ret;
- strlcpy(iter->module_name, "bpf", MODULE_NAME_LEN);
+ strscpy(iter->module_name, "bpf", MODULE_NAME_LEN);
iter->exported = 0;
ret = bpf_get_kallsym(iter->pos - iter->pos_ftrace_mod_end,
&iter->value, &iter->type,
@@ -687,7 +687,7 @@ static int get_ksymbol_bpf(struct kallsym_iter *iter)
*/
static int get_ksymbol_kprobe(struct kallsym_iter *iter)
{
- strlcpy(iter->module_name, "__builtin__kprobes", MODULE_NAME_LEN);
+ strscpy(iter->module_name, "__builtin__kprobes", MODULE_NAME_LEN);
iter->exported = 0;
return kprobe_get_kallsym(iter->pos - iter->pos_bpf_end,
&iter->value, &iter->type,
diff --git a/kernel/params.c b/kernel/params.c
index 6a7548979aa9..07d01f6ce9a2 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -847,7 +847,7 @@ static void __init param_sysfs_builtin(void)
name_len = 0;
} else {
name_len = dot - kp->name + 1;
- strlcpy(modname, kp->name, name_len);
+ strscpy(modname, kp->name, name_len);
}
kernel_add_sysfs_param(modname, kp, name_len);
}
--
2.41.0.162.gfafddb0af9-goog
next reply other threads:[~2023-06-14 1:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 1:03 Azeem Shaikh [this message]
2023-06-14 17:53 ` [PATCH] kallsyms: Replace all non-returning strlcpy with strscpy Kees Cook
2023-06-14 18:47 ` 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=20230614010354.1026096-1-azeemshaikh38@gmail.com \
--to=azeemshaikh38@gmail.com \
--cc=alan.maguire@oracle.com \
--cc=bpf@vger.kernel.org \
--cc=christian.koenig@amd.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=linux@weissschuh.net \
--cc=maninder1.s@samsung.com \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--cc=peterz@infradead.org \
--cc=thunder.leizhen@huawei.com \
/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