| 1 |
From 6aade587d329ebe88319dfdb8e8c7b6aede80417 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Jiri Kosina <jkosina@suse.cz> |
| 3 |
Date: Thu, 24 Jun 2021 13:11:36 +0200 |
| 4 |
Subject: drm/amdgpu: Avoid printing of stack contents on firmware load error |
| 5 |
|
| 6 |
From: Jiri Kosina <jkosina@suse.cz> |
| 7 |
|
| 8 |
commit 6aade587d329ebe88319dfdb8e8c7b6aede80417 upstream. |
| 9 |
|
| 10 |
In case when psp_init_asd_microcode() fails to load ASD microcode file, |
| 11 |
psp_v12_0_init_microcode() tries to print the firmware filename that |
| 12 |
failed to load before bailing out. |
| 13 |
|
| 14 |
This is wrong because: |
| 15 |
|
| 16 |
- the firmware filename it would want it print is an incorrect one as |
| 17 |
psp_init_asd_microcode() and psp_v12_0_init_microcode() are loading |
| 18 |
different filenames |
| 19 |
- it tries to print fw_name, but that's not yet been initialized by that |
| 20 |
time, so it prints random stack contents, e.g. |
| 21 |
|
| 22 |
amdgpu 0000:04:00.0: Direct firmware load for amdgpu/renoir_asd.bin failed with error -2 |
| 23 |
amdgpu 0000:04:00.0: amdgpu: fail to initialize asd microcode |
| 24 |
amdgpu 0000:04:00.0: amdgpu: psp v12.0: Failed to load firmware "\xfeTO\x8e\xff\xff" |
| 25 |
|
| 26 |
Fix that by bailing out immediately, instead of priting the bogus error |
| 27 |
message. |
| 28 |
|
| 29 |
Reported-by: Vojtech Pavlik <vojtech@ucw.cz> |
| 30 |
Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| 31 |
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| 32 |
Cc: stable@vger.kernel.org |
| 33 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 34 |
--- |
| 35 |
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +++---- |
| 36 |
1 file changed, 3 insertions(+), 4 deletions(-) |
| 37 |
|
| 38 |
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c |
| 39 |
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c |
| 40 |
@@ -67,7 +67,7 @@ static int psp_v12_0_init_microcode(stru |
| 41 |
|
| 42 |
err = psp_init_asd_microcode(psp, chip_name); |
| 43 |
if (err) |
| 44 |
- goto out; |
| 45 |
+ return err; |
| 46 |
|
| 47 |
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name); |
| 48 |
err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev); |
| 49 |
@@ -80,7 +80,7 @@ static int psp_v12_0_init_microcode(stru |
| 50 |
} else { |
| 51 |
err = amdgpu_ucode_validate(adev->psp.ta_fw); |
| 52 |
if (err) |
| 53 |
- goto out2; |
| 54 |
+ goto out; |
| 55 |
|
| 56 |
ta_hdr = (const struct ta_firmware_header_v1_0 *) |
| 57 |
adev->psp.ta_fw->data; |
| 58 |
@@ -105,10 +105,9 @@ static int psp_v12_0_init_microcode(stru |
| 59 |
|
| 60 |
return 0; |
| 61 |
|
| 62 |
-out2: |
| 63 |
+out: |
| 64 |
release_firmware(adev->psp.ta_fw); |
| 65 |
adev->psp.ta_fw = NULL; |
| 66 |
-out: |
| 67 |
if (err) { |
| 68 |
dev_err(adev->dev, |
| 69 |
"psp v12.0: Failed to load firmware \"%s\"\n", |
Parent Directory
| 
Revision Log