* [PATCH] drm/i915: Replace all non-returning strlcpy with strscpy
@ 2023-05-22 15:52 Azeem Shaikh
2023-05-22 20:16 ` Kees Cook
0 siblings, 1 reply; 3+ messages in thread
From: Azeem Shaikh @ 2023-05-22 15:52 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin
Cc: linux-hardening, Azeem Shaikh, intel-gfx, linux-kernel,
David Airlie, Daniel Vetter, John Harrison, Matthew Brost,
Ashutosh Dixit, Lionel Landwerlin, Umesh Nerlige Ramappa,
dri-devel
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>
---
drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index 24dde5531423..d4608b220123 100644
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -28,7 +28,7 @@ alloc_empty_config(struct i915_perf *perf)
oa_config->perf = perf;
kref_init(&oa_config->ref);
- strlcpy(oa_config->uuid, TEST_OA_CONFIG_UUID, sizeof(oa_config->uuid));
+ strscpy(oa_config->uuid, TEST_OA_CONFIG_UUID, sizeof(oa_config->uuid));
mutex_lock(&perf->metrics_lock);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Replace all non-returning strlcpy with strscpy
2023-05-22 15:52 [PATCH] drm/i915: Replace all non-returning strlcpy with strscpy Azeem Shaikh
@ 2023-05-22 20:16 ` Kees Cook
2023-05-24 13:40 ` Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2023-05-22 20:16 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin,
linux-hardening, intel-gfx, linux-kernel, David Airlie,
Daniel Vetter, John Harrison, Matthew Brost, Ashutosh Dixit,
Lionel Landwerlin, Umesh Nerlige Ramappa, dri-devel
On Mon, May 22, 2023 at 03:52:28PM +0000, Azeem Shaikh wrote:
> 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>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Replace all non-returning strlcpy with strscpy
2023-05-22 20:16 ` Kees Cook
@ 2023-05-24 13:40 ` Rodrigo Vivi
0 siblings, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2023-05-24 13:40 UTC (permalink / raw)
To: Kees Cook
Cc: Azeem Shaikh, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, linux-hardening, intel-gfx, linux-kernel,
David Airlie, Daniel Vetter, John Harrison, Matthew Brost,
Ashutosh Dixit, Lionel Landwerlin, Umesh Nerlige Ramappa,
dri-devel
On Mon, May 22, 2023 at 01:16:03PM -0700, Kees Cook wrote:
> On Mon, May 22, 2023 at 03:52:28PM +0000, Azeem Shaikh wrote:
> > 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>
>
> Reviewed-by: Kees Cook <keescook@chromium.org>
pushed to drm-intel-next. Thanks for the patch and review.
>
> --
> Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-24 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-22 15:52 [PATCH] drm/i915: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-22 20:16 ` Kees Cook
2023-05-24 13:40 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox