Commit ebf27765 authored by Ahmed Salem's avatar Ahmed Salem Committed by Rafael J. Wysocki
Browse files

ACPICA: Replace strncpy() with memcpy() 

ACPICA commit 83019b471e1902151e67c588014ba2d09fa099a3

strncpy() is deprecated for NUL-terminated destination buffers[1].

Use memcpy() for length-bounded destinations.

Link: https://github.com/KSPP/linux/issues/90 [1]
Link: https://github.com/acpica/acpica/commit/83019b47


Signed-off-by: default avatarAhmed Salem <x0rw3ll@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1910878.atdPhlSkOF@rjwysocki.net
parent 70662db7

drivers/acpi/acpica/exconvrt.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, 
		/* Copy the string to the buffer */



		new_buf = return_desc->buffer.pointer;

		strncpy((char *)new_buf, (char *)obj_desc->string.pointer,

		memcpy((char *)new_buf, (char *)obj_desc->string.pointer,

		       obj_desc->string.length);

		break;

drivers/acpi/acpica/tbfind.c

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ acpi_tb_find_table(char *signature, 


	memset(&header, 0, sizeof(struct acpi_table_header));

	ACPI_COPY_NAMESEG(header.signature, signature);

	strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);

	strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);

	memcpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);

	memcpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);



	/* Search for the table */

drivers/acpi/acpica/utnonansi.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void acpi_ut_safe_strncpy(char *dest, char *source, acpi_size dest_size) 
{

	/* Always terminate destination string */



	strncpy(dest, source, dest_size);

	memcpy(dest, source, dest_size);

	dest[dest_size - 1] = 0;

}

include/acpi/actypes.h

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ typedef u64 acpi_integer; 
#define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))

#else

#define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))

#define ACPI_COPY_NAMESEG(dest,src)     (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))

#define ACPI_COPY_NAMESEG(dest,src)     (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))

#endif



/* Support for the special RSDP signature (8 characters) */