drm/amd: Use a constant format string for amdgpu_ucode_request
Subsystems (3)
PATCH 1/1 drm/amd: Use a constant format string for amdgpu_ucode_request
From: Arnd Bergmann <[email protected]>
Multiple files in amdgpu call amdgpu_ucode_request() with a fw_name variable that the compiler cannot check for being a valid format string, as seen by enabling the (default-disabled) -Wformat-security option:
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c: In function 'amdgpu_mes_init_microcode':drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c:1517:61: error: format not a string literal and no format arguments [-Werror=format-security]
1517 | r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], fw_name);
| ^~~~~~~drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c: In function 'amdgpu_uvd_sw_init':drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:9: error: format not a string literal and no format arguments [-Werror=format-security]
263 | r = amdgpu_ucode_request(adev, &adev->uvd.fw, fw_name);
| ^
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c: In function 'amdgpu_vce_sw_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:161:9: error: format not a string literal and no format arguments [-Werror=format-security]
161 | r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name);
| ^
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c: In function 'amdgpu_umsch_mm_init_microcode':
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c:590:9: error: format not a string literal and no format arguments [-Werror=format-security]
590 | r = amdgpu_ucode_request(adev, &adev->umsch_mm.fw, fw_name);
| ^drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c: In function 'amdgpu_cgs_get_firmware_info':drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:417:72: error: format not a string literal and no format arguments [-Werror=format-security]
417 | err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);
| ^~~~~~~drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2221:9: error: format not a string literal and no format arguments [-Werror=format-security]
2221 | r = amdgpu_ucode_request(adev, &adev->dm.fw_dmcu, fw_name_dmcu);
| ^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'dm_init_microcode':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5147:9: error: format not a string literal and no format arguments [-Werror=format-security]
5147 | r = amdgpu_ucode_request(adev, &adev->dm.dmub_fw, fw_name_dmub);
| ^Change these all to use a "%s" format with the actual name as an argument, to let the compiler prove this to be correct.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1 -1
@@ -414,7 +414,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,return -EINVAL ; } - err =amdgpu_ucode_request (adev, &adev->pm.fw, fw_name); + err =amdgpu_ucode_request (adev, &adev->pm.fw,"%s" , fw_name);if (err) {DRM_ERROR ("Failed to load firmware \"%s\"" , fw_name);amdgpu_ucode_release (&adev->pm.fw);
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1 -1
@@ -1514,7 +1514,7 @@ int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe) pipe == AMDGPU_MES_SCHED_PIPE ? "" : "1"); } - r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe], fw_name); + r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe],"%s" , fw_name);if (r && need_retry && pipe ==AMDGPU_MES_SCHED_PIPE ) {dev_info (adev->dev,"try to fall back to %s_mes.bin\n" , ucode_prefix); r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe],
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c +1 -1
@@ -587,7 +587,7 @@ int amdgpu_umsch_mm_init_microcode(struct amdgpu_umsch_mm *umsch)break ; } - r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw,"%s" , fw_name);if (r) {release_firmware (adev->umsch_mm.fw); adev->umsch_mm.fw =NULL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -1
@@ -260,7 +260,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)return -EINVAL ; } - r =amdgpu_ucode_request (adev, &adev->uvd.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->uvd.fw,"%s" , fw_name);if (r) {dev_err (adev->dev,"amdgpu_uvd: Can't validate firmware \"%s\"\n" , fw_name);
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +1 -1
@@ -158,7 +158,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)return -EINVAL ; } - r =amdgpu_ucode_request (adev, &adev->vce.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->vce.fw,"%s" , fw_name);if (r) {dev_err (adev->dev,"amdgpu_vce: Can't validate firmware \"%s\"\n" , fw_name);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -2218,7 +2218,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)return 0 ; } - r =amdgpu_ucode_request (adev, &adev->dm.fw_dmcu, fw_name_dmcu); + r =amdgpu_ucode_request (adev, &adev->dm.fw_dmcu,"%s" , fw_name_dmcu);if (r == -ENODEV ) {/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ DRM_DEBUG_KMS ("dm: DMCU firmware not found\n" );
@@ -5144,7 +5144,7 @@ static int dm_init_microcode(struct amdgpu_device *adev)/* ASIC doesn't support DMUB. */ return 0 ; } - r =amdgpu_ucode_request (adev, &adev->dm.dmub_fw, fw_name_dmub); + r =amdgpu_ucode_request (adev, &adev->dm.dmub_fw,"%s" , fw_name_dmub);return r; }
Signature · 1 line
2.39.2
Alex Deucher
AppliedApplied. Thanks!
Quoted 141 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Multiple files in amdgpu call
amdgpu_ucode_request()with afw_namevariable that the compiler cannot check for being a valid format string, as seen by enabling the (default-disabled) -Wformat-security option:
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c: In function 'amdgpu_mes_init_microcode':drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c:1517:61: error: format not a string literal and no format arguments [-Werror=format-security]
1517 | r =amdgpu_ucode_request(adev, &adev->mes.fw[pipe], fw_name);
| ^~~~~~~drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c: In function 'amdgpu_uvd_sw_init':drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:9: error: format not a string literal and no format arguments [-Werror=format-security]263 | r = amdgpu_ucode_request(adev, &adev->uvd.fw, fw_name); | ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c: In function 'amdgpu_vce_sw_init': drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c:161:9: error: format not a string literal and no format arguments [-Werror=format-security] 161 | r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name); | ^ drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c: In function 'amdgpu_umsch_mm_init_microcode': drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c:590:9: error: format not a string literal and no format arguments [-Werror=format-security] 590 | r = amdgpu_ucode_request(adev, &adev->umsch_mm.fw, fw_name); | ^
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c: In function 'amdgpu_cgs_get_firmware_info':drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:417:72: error: format not a string literal and no format arguments [-Werror=format-security]
417 | err =amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);
| ^~~~~~~drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2221:9: error: format not a string literal and no format arguments [-Werror=format-security]2221 | r = amdgpu_ucode_request(adev, &adev->dm.fw_dmcu, fw_name_dmcu); | ^ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'dm_init_microcode': drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5147:9: error: format not a string literal and no format arguments [-Werror=format-security] 5147 | r = amdgpu_ucode_request(adev, &adev->dm.dmub_fw, fw_name_dmub); | ^Change these all to use a "%s" format with the actual name as an argument, to let the compiler prove this to be correct.
Fixes e5a7d047f41b ("drm/amd: Use `amdgpu_ucode_*` helpers for CGS")Fixes 52215e2a5d4a ("drm/amd: Use `amdgpu_ucode_*` helpers for VCE")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1
-1@@ -414,7 +414,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,return -EINVAL ; } - err =amdgpu_ucode_request (adev, &adev->pm.fw, fw_name); + err =amdgpu_ucode_request (adev, &adev->pm.fw,"%s" , fw_name);if (err) {DRM_ERROR ("Failed to load firmware \"%s\"" , fw_name);amdgpu_ucode_release (&adev->pm.fw);drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1
-1@@ -1514,7 +1514,7 @@ int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe) pipe == AMDGPU_MES_SCHED_PIPE ? "" : "1"); } - r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe], fw_name); + r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe],"%s" , fw_name);if (r && need_retry && pipe ==AMDGPU_MES_SCHED_PIPE ) {dev_info (adev->dev,"try to fall back to %s_mes.bin\n" , ucode_prefix); r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe],drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c +1
-1@@ -587,7 +587,7 @@ int amdgpu_umsch_mm_init_microcode(struct amdgpu_umsch_mm *umsch)break ; } - r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw,"%s" , fw_name);if (r) {release_firmware (adev->umsch_mm.fw); adev->umsch_mm.fw =NULL ;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1
-1@@ -260,7 +260,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)return -EINVAL ; } - r =amdgpu_ucode_request (adev, &adev->uvd.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->uvd.fw,"%s" , fw_name);if (r) {dev_err (adev->dev,"amdgpu_uvd: Can't validate firmware \"%s\"\n" , fw_name);drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +1
-1@@ -158,7 +158,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)return -EINVAL ; } - r =amdgpu_ucode_request (adev, &adev->vce.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->vce.fw,"%s" , fw_name);if (r) {dev_err (adev->dev,"amdgpu_vce: Can't validate firmware \"%s\"\n" , fw_name);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-3@@ -2218,7 +2218,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)return 0 ; } - r =amdgpu_ucode_request (adev, &adev->dm.fw_dmcu, fw_name_dmcu); + r =amdgpu_ucode_request (adev, &adev->dm.fw_dmcu,"%s" , fw_name_dmcu);if (r == -ENODEV ) {/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ DRM_DEBUG_KMS ("dm: DMCU firmware not found\n" );@@ -5144,7 +5144,7 @@ static int dm_init_microcode(struct amdgpu_device *adev)/* ASIC doesn't support DMUB. */ return 0 ; } - r =amdgpu_ucode_request (adev, &adev->dm.dmub_fw, fw_name_dmub); + r =amdgpu_ucode_request (adev, &adev->dm.dmub_fw,"%s" , fw_name_dmub);return r; } --2.39.2
Quoted 10 lines · Alex Deucher
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c int amdgpu_umsch_mm_init_microcode(struct amdgpu_umsch_mm *umsch) · line 590
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c +1
-1@@ -587,7 +587,7 @@ int amdgpu_umsch_mm_init_microcode(struct amdgpu_umsch_mm *umsch)break ; } - r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw, fw_name); + r =amdgpu_ucode_request (adev, &adev->umsch_mm.fw,"%s" , fw_name);
Looks like this triggers:
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c: In function ‘amdgpu_umsch_mm_init_microcode’:drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c:590:13: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
590 | r = amdgpu_ucode_request(adev, &adev->umsch_mm.fw, "%s", fw_name);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~now.
Attaching randconfig.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette