]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
EDAC/amd64: Avoid a -Wformat-security warning
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Dec 2025 10:02:25 +0000 (11:02 +0100)
committerBorislav Petkov (AMD) <bp@alien8.de>
Tue, 30 Dec 2025 16:27:11 +0000 (17:27 +0100)
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
drivers/edac/amd64_edac.c

index 2391f3469961ab20b968188fc4b2b68fa83c541c..63fca0ee2c23bc7772c4012b0cc0f8b2d5f96b40 100644 (file)
@@ -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);