From 8b8ff051b386c33a45e47031707f6c1d44a54c2d Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 17 Apr 2015 10:50:02 -0400 Subject: [PATCH] drm/amdgpu: Do not directly dereference pointers to BIOS area. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use readb() and memcpy_fromio() accessors instead. Ported from radeon commit: 9d07f300a1a3dd5f8a0ac7fea6e127d37f56c8c1 Acked-by: Christian König Acked-by: Jammy Zhou Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index d7a3ab2624f0c..ceb444f6d418d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c @@ -75,7 +75,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) bool amdgpu_read_bios(struct amdgpu_device *adev) { - uint8_t __iomem *bios; + uint8_t __iomem *bios, val1, val2; size_t size; adev->bios = NULL; @@ -85,15 +85,19 @@ bool amdgpu_read_bios(struct amdgpu_device *adev) return false; } - if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) { + val1 = readb(&bios[0]); + val2 = readb(&bios[1]); + + if (size == 0 || val1 != 0x55 || val2 != 0xaa) { pci_unmap_rom(adev->pdev, bios); return false; } - adev->bios = kmemdup(bios, size, GFP_KERNEL); + adev->bios = kzalloc(size, GFP_KERNEL); if (adev->bios == NULL) { pci_unmap_rom(adev->pdev, bios); return false; } + memcpy_fromio(adev->bios, bios, size); pci_unmap_rom(adev->pdev, bios); return true; } -- 2.39.5