From 0923a618a78fe4e329d79d6d50f8db2620845d39 Mon Sep 17 00:00:00 2001 From: Chen Ni Date: Mon, 1 Jul 2024 15:21:18 +0800 Subject: [PATCH 1/2] RAS/AMD/ATL: Remove an unneeded semicolon Remove an unneeded semicolon. No functional changes. Detected by Coccinelle. Signed-off-by: Chen Ni Signed-off-by: Borislav Petkov (AMD) Link: https://patch.msgid.link/20240701072118.846277-1-nichen@iscas.ac.cn --- drivers/ras/amd/atl/denormalize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ras/amd/atl/denormalize.c b/drivers/ras/amd/atl/denormalize.c index 1a525cfa983c..d45ce753e636 100644 --- a/drivers/ras/amd/atl/denormalize.c +++ b/drivers/ras/amd/atl/denormalize.c @@ -683,7 +683,7 @@ static int denorm_addr_df4_np2(struct addr_ctx *ctx) default: atl_debug_on_bad_intlv_mode(ctx); return -EINVAL; - }; + } if (ctx->map.num_intlv_sockets == 1) { hash_pa8 = BIT_ULL(shift_value) & ctx->ret_addr; From c816ba1dcd931b9db8d66c71e1ae34ddcdbf968f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 4 Dec 2025 11:02:25 +0100 Subject: [PATCH 2/2] EDAC/amd64: Avoid a -Wformat-security warning 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 Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Avadhut Naik Reviewed-by: Qiuxu Zhuo Reviewed-by: Yazen Ghannam Link: https://patch.msgid.link/20251204100231.1034557-1-arnd@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 2391f3469961..63fca0ee2c23 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);