Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32c37321 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Greg Kroah-Hartman
Browse files

efi/cper: use stack buffer for error record decoding 



commit b3a72ca80351917cc23f9e24c35f3c3979d3c121 upstream.

Joe reports that using a statically allocated buffer for converting CPER
error records into human readable text is probably a bad idea. Even
though we are not aware of any actual issues, a stack buffer is clearly
a better choice here anyway, so let's move the buffer into the stack
frames of the two functions that refer to it.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e287e00

drivers/firmware/efi/cper.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,6 @@ 




#define INDENT_SP	" "

#define INDENT_SP	" "





static char rcd_decode_str[CPER_REC_LEN];



/*

/*

 * CPER record ID need to be unique even after reboot, because record

 * CPER record ID need to be unique even after reboot, because record

 * ID is used as index for ERST storage, while CPER records from

 * ID is used as index for ERST storage, while CPER records from
@@ -293,6 +291,7 @@ const char *cper_mem_err_unpack(struct trace_seq *p, 
				struct cper_mem_err_compact *cmem)

				struct cper_mem_err_compact *cmem)

{

{

	const char *ret = trace_seq_buffer_ptr(p);

	const char *ret = trace_seq_buffer_ptr(p);

	char rcd_decode_str[CPER_REC_LEN];





	if (cper_mem_err_location(cmem, rcd_decode_str))

	if (cper_mem_err_location(cmem, rcd_decode_str))

		trace_seq_printf(p, "%s", rcd_decode_str);

		trace_seq_printf(p, "%s", rcd_decode_str);
@@ -307,6 +306,7 @@ static void cper_print_mem(const char *pfx, const struct cper_sec_mem_err *mem, 
	int len)

	int len)

{

{

	struct cper_mem_err_compact cmem;

	struct cper_mem_err_compact cmem;

	char rcd_decode_str[CPER_REC_LEN];





	/* Don't trust UEFI 2.1/2.2 structure with bad validation bits */

	/* Don't trust UEFI 2.1/2.2 structure with bad validation bits */

	if (len == sizeof(struct cper_sec_mem_err_old) &&

	if (len == sizeof(struct cper_sec_mem_err_old) &&