| From da3ca8d595f5c4a3eac997402b3fd1225bc9b901 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Dec 2025 11:02:25 +0100 |
| Subject: EDAC/amd64: Avoid a -Wformat-security warning |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit c816ba1dcd931b9db8d66c71e1ae34ddcdbf968f ] |
| |
| Using a variable as a format string causes a (default-disabled) warning: |
| |
| drivers/edac/amd64_edac.c: In function 'per_family_init': |
| drivers/edac/amd64_edac.c:3914:17: error: format not a string literal and no format arguments [-Werror=format-security] |
| 3914 | scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name); |
| | ^~~~~~~~~ |
| |
| The code here is safe, but in order to enable the warning by default in the |
| future, change this instance to pass the name indirectly. |
| |
| Fixes: e9abd990aefd ("EDAC/amd64: Generate ctl_name string at runtime") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> |
| Reviewed-by: Avadhut Naik <avadhut.naik@amd.com> |
| Reviewed-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> |
| Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com> |
| Link: https://patch.msgid.link/20251204100231.1034557-1-arnd@kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/edac/amd64_edac.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c |
| index 2391f3469961a..63fca0ee2c23b 100644 |
| --- a/drivers/edac/amd64_edac.c |
| +++ b/drivers/edac/amd64_edac.c |
| @@ -3911,7 +3911,7 @@ static int per_family_init(struct amd64_pvt *pvt) |
| } |
| |
| if (tmp_name) |
| - scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name); |
| + scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "%s", tmp_name); |
| else |
| scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh", |
| pvt->fam, pvt->model); |
| -- |
| 2.51.0 |
| |