| From caa00aa9d967ac1c3e8b42d9115371bd6bd00ed8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 14 Aug 2025 09:52:53 -0700 |
| Subject: efi/cper: Adjust infopfx size to accept an extra space |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| |
| [ Upstream commit 8ad2c72e21efb3dc76c5b14089fa7984cdd87898 ] |
| |
| Compiling with W=1 with werror enabled produces an error: |
| |
| drivers/firmware/efi/cper-arm.c: In function ‘cper_print_proc_arm’: |
| drivers/firmware/efi/cper-arm.c:298:64: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=] |
| 298 | snprintf(infopfx, sizeof(infopfx), "%s ", newpfx); |
| | ^ |
| drivers/firmware/efi/cper-arm.c:298:25: note: ‘snprintf’ output between 2 and 65 bytes into a destination of size 64 |
| 298 | snprintf(infopfx, sizeof(infopfx), "%s ", newpfx); |
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| |
| As the logic there adds an space at the end of infopx buffer. |
| Add an extra space to avoid such warning. |
| |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Acked-by: Borislav Petkov (AMD) <bp@alien8.de> |
| Signed-off-by: Ard Biesheuvel <ardb@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/firmware/efi/cper-arm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c |
| index 36d3b8b9da47e..f4b7a48327fbb 100644 |
| --- a/drivers/firmware/efi/cper-arm.c |
| +++ b/drivers/firmware/efi/cper-arm.c |
| @@ -241,7 +241,7 @@ void cper_print_proc_arm(const char *pfx, |
| int i, len, max_ctx_type; |
| struct cper_arm_err_info *err_info; |
| struct cper_arm_ctx_info *ctx_info; |
| - char newpfx[64], infopfx[64]; |
| + char newpfx[64], infopfx[ARRAY_SIZE(newpfx) + 1]; |
| |
| printk("%sMIDR: 0x%016llx\n", pfx, proc->midr); |
| |
| -- |
| 2.51.0 |
| |
