Skip to content

Commit 939fcf7

Browse files
JustinStittlynxeye-dev
authored andcommitted
drm/etnaviv: Replace strncpy with strscpy_pad
`strncpy` is deprecated for use on NUL-terminated destination strings [1]. We should prefer more robust and less ambiguous string interfaces. A suitable replacement is `strscpy_pad` due to the fact that it guarantees NUL-termination on the destination buffer whilst maintaining the NUL-padding behavior that strncpy provides. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: KSPP#90 Cc: linux-hardening@vger.kernel.org Cc: Bo YU <tsu.yubo@gmail.com> Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com> [lst: changed subject according to suggestion from Kees] Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
1 parent 0bb80ec commit 939fcf7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,
511511

512512
domain->id = domain->iter;
513513
domain->nr_signals = dom->nr_signals;
514-
strncpy(domain->name, dom->name, sizeof(domain->name));
514+
strscpy_pad(domain->name, dom->name, sizeof(domain->name));
515515

516516
domain->iter++;
517517
if (domain->iter == nr_domains)
@@ -540,7 +540,7 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu,
540540
sig = &dom->signal[signal->iter];
541541

542542
signal->id = signal->iter;
543-
strncpy(signal->name, sig->name, sizeof(signal->name));
543+
strscpy_pad(signal->name, sig->name, sizeof(signal->name));
544544

545545
signal->iter++;
546546
if (signal->iter == dom->nr_signals)

0 commit comments

Comments
 (0)