[PATCH] kcsan: test: Replace deprecated strcpy() with strscpy()

3 views
Skip to first unread message

Thorsten Blum

unread,
Aug 15, 2025, 5:38:42 PM8/15/25
to Marco Elver, Dmitry Vyukov, linux-h...@vger.kernel.org, Thorsten Blum, kasa...@googlegroups.com, linux-...@vger.kernel.org
strcpy() is deprecated; use strscpy() instead.

Link: https://github.com/KSPP/linux/issues/88
Signed-off-by: Thorsten Blum <thorst...@linux.dev>
---
kernel/kcsan/kcsan_test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
index 49ab81faaed9..ea1cb4c8a894 100644
--- a/kernel/kcsan/kcsan_test.c
+++ b/kernel/kcsan/kcsan_test.c
@@ -125,7 +125,7 @@ static void probe_console(void *ignore, const char *buf, size_t len)
goto out;

/* No second line of interest. */
- strcpy(observed.lines[nlines++], "<none>");
+ strscpy(observed.lines[nlines++], "<none>");
}
}

@@ -231,7 +231,7 @@ static bool __report_matches(const struct expect_report *r)

if (!r->access[1].fn) {
/* Dummy string if no second access is available. */
- strcpy(cur, "<none>");
+ strscpy(expect[2], "<none>");
break;
}
}
--
2.50.1

Justin Stitt

unread,
Aug 18, 2025, 2:27:05 PM8/18/25
to Thorsten Blum, Marco Elver, Dmitry Vyukov, linux-h...@vger.kernel.org, kasa...@googlegroups.com, linux-...@vger.kernel.org
Hi,

On Fri, Aug 15, 2025 at 11:37:44PM +0200, Thorsten Blum wrote:
> strcpy() is deprecated; use strscpy() instead.
>
> Link: https://github.com/KSPP/linux/issues/88
> Signed-off-by: Thorsten Blum <thorst...@linux.dev>
> ---
> kernel/kcsan/kcsan_test.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
> index 49ab81faaed9..ea1cb4c8a894 100644
> --- a/kernel/kcsan/kcsan_test.c
> +++ b/kernel/kcsan/kcsan_test.c
> @@ -125,7 +125,7 @@ static void probe_console(void *ignore, const char *buf, size_t len)
> goto out;
>
> /* No second line of interest. */
> - strcpy(observed.lines[nlines++], "<none>");
> + strscpy(observed.lines[nlines++], "<none>");

Looks good.

Here's my checklist:
1) strcpy() and strscpy() have differing return values, but we aren't using
it.
2) strscpy() can fail with -E2BIG if source is too big, but it isn't in
this case.
3) two-arg version of strscpy() is OK to use here as the source has a known
size at compile time.

Reviewed-by: Justin Stitt <justi...@google.com>

> }
> }
>
> @@ -231,7 +231,7 @@ static bool __report_matches(const struct expect_report *r)
>
> if (!r->access[1].fn) {
> /* Dummy string if no second access is available. */
> - strcpy(cur, "<none>");
> + strscpy(expect[2], "<none>");
> break;
> }
> }
> --
> 2.50.1
>
>

Thanks
Justin

Thorsten Blum

unread,
Aug 18, 2025, 3:32:09 PM8/18/25
to Justin Stitt, Marco Elver, Dmitry Vyukov, linux-h...@vger.kernel.org, kasa...@googlegroups.com, linux-...@vger.kernel.org
On 18. Aug 2025, at 20:26, Justin Stitt wrote:
> Looks good.
>
> Here's my checklist:
> 1) strcpy() and strscpy() have differing return values, but we aren't using
> it.
> 2) strscpy() can fail with -E2BIG if source is too big, but it isn't in
> this case.
> 3) two-arg version of strscpy() is OK to use here as the source has a known
> size at compile time.
>
> Reviewed-by: Justin Stitt <justi...@google.com>

Thanks for your thorough review.

Thorsten

Marco Elver

unread,
Aug 19, 2025, 3:01:38 PM8/19/25
to Thorsten Blum, Dmitry Vyukov, linux-h...@vger.kernel.org, kasa...@googlegroups.com, linux-...@vger.kernel.org
On Fri, 15 Aug 2025 at 23:38, Thorsten Blum <thorst...@linux.dev> wrote:
>
> strcpy() is deprecated; use strscpy() instead.
>
> Link: https://github.com/KSPP/linux/issues/88
> Signed-off-by: Thorsten Blum <thorst...@linux.dev>

Reviewed-by: Marco Elver <el...@google.com>

Taking this into the -kcsan tree, but might be a while until it hits mainline.

> ---
> kernel/kcsan/kcsan_test.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
> index 49ab81faaed9..ea1cb4c8a894 100644
> --- a/kernel/kcsan/kcsan_test.c
> +++ b/kernel/kcsan/kcsan_test.c
> @@ -125,7 +125,7 @@ static void probe_console(void *ignore, const char *buf, size_t len)
> goto out;
>
> /* No second line of interest. */
> - strcpy(observed.lines[nlines++], "<none>");
> + strscpy(observed.lines[nlines++], "<none>");
> }
> }
>
> @@ -231,7 +231,7 @@ static bool __report_matches(const struct expect_report *r)
>
> if (!r->access[1].fn) {
> /* Dummy string if no second access is available. */
> - strcpy(cur, "<none>");
> + strscpy(expect[2], "<none>");
> break;
> }
> }
> --
> 2.50.1
>
> --
> You received this message because you are subscribed to the Google Groups "kasan-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+...@googlegroups.com.
> To view this discussion visit https://groups.google.com/d/msgid/kasan-dev/20250815213742.321911-3-thorsten.blum%40linux.dev.
Reply all
Reply to author
Forward
0 new messages