Commit 8453e792 authored by Azeem Shaikh's avatar Azeem Shaikh Committed by Kees Cook
Browse files

soc: fsl: qe: Replace all non-returning strlcpy with strscpy 

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: default avatarAzeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230523021425.2406309-1-azeemshaikh38@gmail.com


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent ce661672

drivers/soc/fsl/qe/qe.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) 
	 * saved microcode information and put in the new.

	 */

	memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));

	strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id));

	strscpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id));

	qe_firmware_info.extended_modes = be64_to_cpu(firmware->extended_modes);

	memcpy(qe_firmware_info.vtraps, firmware->vtraps,

		sizeof(firmware->vtraps));
@@ -599,7 +599,7 @@ struct qe_firmware_info *qe_get_firmware_info(void) 
	/* Copy the data into qe_firmware_info*/

	sprop = of_get_property(fw, "id", NULL);

	if (sprop)

		strlcpy(qe_firmware_info.id, sprop,

		strscpy(qe_firmware_info.id, sprop,

			sizeof(qe_firmware_info.id));



	of_property_read_u64(fw, "extended-modes",