Commit c816ba1d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Borislav Petkov (AMD)
Browse files

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: e9abd990 ("EDAC/amd64: Generate ctl_name string at runtime")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarAvadhut Naik <avadhut.naik@amd.com>
Reviewed-by: default avatarQiuxu Zhuo <qiuxu.zhuo@intel.com>
Reviewed-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Link: https://patch.msgid.link/20251204100231.1034557-1-arnd@kernel.org
parent 8f0b4cce

drivers/edac/amd64_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);