Commit 849e133c authored by Ma Jun's avatar Ma Jun Committed by Alex Deucher
Browse files

drm/amdgpu: Fix the null pointer when load rlc firmware 



If the RLC firmware is invalid because of wrong header size,
the pointer to the rlc firmware is released in function
amdgpu_ucode_request. There will be a null pointer error
in subsequent use. So skip validation to fix it.

Signed-off-by: default avatarMa Jun <Jun.Ma2@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e2965bd

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+6 −9
Original line number Diff line number Diff line
@@ -3996,16 +3996,13 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) 


	if (!amdgpu_sriov_vf(adev)) {

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);

		err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw, fw_name);

		/* don't check this.  There are apparently firmwares in the wild with

		 * incorrect size in the header

		 */

		if (err == -ENODEV)

			goto out;

		err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);

		if (err)

			dev_dbg(adev->dev,

				"gfx10: amdgpu_ucode_request() failed \"%s\"\n",

				fw_name);

			goto out;



		/* don't validate this firmware. There are apparently firmwares

		 * in the wild with incorrect size in the header

		 */

		rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;

		version_major = le16_to_cpu(rlc_hdr->header.header_version_major);

		version_minor = le16_to_cpu(rlc_hdr->header.header_version_minor);