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

Commit 92ef9425 authored by Mahesh Salgaonkar's avatar Mahesh Salgaonkar Committed by Greg Kroah-Hartman
Browse files

powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX. 



[ Upstream commit 74e96bf44f430cf7a01de19ba6cf49b361cdfd6e ]

The global mce data buffer that used to copy rtas error log is of 2048
(RTAS_ERROR_LOG_MAX) bytes in size. Before the copy we read
extended_log_length from rtas error log header, then use max of
extended_log_length and RTAS_ERROR_LOG_MAX as a size of data to be copied.
Ideally the platform (phyp) will never send extended error log with
size > 2048. But if that happens, then we have a risk of buffer overrun
and corruption. Fix this by using min_t instead.

Fixes: d368514c ("powerpc: Fix corruption when grabbing FWNMI data")
Reported-by: default avatarMichal Suchanek <msuchanek@suse.com>
Signed-off-by: default avatarMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3c124c3

arch/powerpc/platforms/pseries/ras.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs) 
		int len, error_log_length;



		error_log_length = 8 + rtas_error_extended_log_length(h);

		len = max_t(int, error_log_length, RTAS_ERROR_LOG_MAX);

		len = min_t(int, error_log_length, RTAS_ERROR_LOG_MAX);

		memset(global_mce_data_buf, 0, RTAS_ERROR_LOG_MAX);

		memcpy(global_mce_data_buf, h, len);

		errhdr = (struct rtas_error_log *)global_mce_data_buf;