nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 11:04:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add checks for acr ucode mem free

Browse Source 
Trying to unmap and free acr ucode memory when it's not initialized
results in NULL pointer dereferencing. Fix this by checking for
validity of ucode memory.

[  132.347391] Unable to handle kernel NULL pointer dereference at
virtual address 00000000
...
[  132.423191] PC is at nvgpu_dma_unmap_free+0x28/0x44 [nvgpu]
[  132.428545] LR is at gm20b_remove_acr_support+0x48/0x64 [nvgpu]
...
[  132.535447] [<ffffff8000eb98f4>] nvgpu_dma_unmap_free+0x28/0x44 [nvgpu]
[  132.541836] [<ffffff8000efc470>] gm20b_remove_acr_support+0x48/0x64 [nvgpu]
[  132.548301] [<ffffff8000ea42f4>] gk20a_remove_support+0x58/0x104 [nvgpu]
[  132.554694] [<ffffff8000ed2790>] gk20a_free_cb+0x48/0x78 [nvgpu]
[  132.560299] [<ffffff8000ed3618>] gk20a_put+0x50/0x70 [nvgpu]
[  132.565628] [<ffffff8000ea744c>] nvgpu_pci_remove+0xcc/0x170 [nvgpu]
[  132.571251] [<ffffff8008499500>] pci_device_remove+0x3c/0x104
[  132.576597] [<ffffff80086939d8>] __device_release_driver+0x7c/0xfc
[  132.582194] [<ffffff8008693a7c>] device_release_driver+0x24/0x38
[  132.588052] [<ffffff8008691a5c>] unbind_store+0xd8/0xfc
[  132.593203] [<ffffff8008690e14>] drv_attr_store+0x20/0x30
[  132.598302] [<ffffff800829ecfc>] sysfs_kf_write+0x40/0x50
[  132.604068] [<ffffff800829e0b0>] kernfs_fop_write+0xb4/0x1d0
[  132.609411] [<ffffff8008216074>] __vfs_write+0x40/0x140
[  132.614571] [<ffffff8008216e50>] vfs_write+0xa8/0x1a0
[  132.619739] [<ffffff8008218328>] SyS_write+0x5c/0xc4
[  132.624967] [<ffffff8008082bc0>] el0_svc_naked+0x34/0x38
[  132.630134] ---[ end trace 3563988eb20f2c14 ]---

This situation occurs when gpu is not able to power on for some reason.

Bug 2412369

Change-Id: Ifc226ebd692b1ead56066dafeb5da4c23bc2ec48
Signed-off-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1939939
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Mahantesh Kumbar <mkumbar@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nitin Kumbhar
2018-10-31 11:32:16 +05:30
committed by mobile promotions
parent aa43e7897e
commit 1d960cfa84
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/nvgpu/gm20b/acr_gm20b.c
View File

@@ -1358,8 +1358,12 @@ void gm20b_remove_acr_support(struct nvgpu_acr *acr)
nvgpu_release_firmware(g, acr->acr.acr_hs_bl.hs_bl_fw);
}
nvgpu_dma_unmap_free(vm, &acr->acr.acr_ucode);
nvgpu_dma_unmap_free(vm, &acr->acr.acr_hs_bl.hs_bl_ucode);
if (nvgpu_mem_is_valid(&acr->acr.acr_ucode)) {
nvgpu_dma_unmap_free(vm, &acr->acr.acr_ucode);
}
if (nvgpu_mem_is_valid(&acr->acr.acr_hs_bl.hs_bl_ucode)) {
nvgpu_dma_unmap_free(vm, &acr->acr.acr_hs_bl.hs_bl_ucode);
}
}
static void gm20b_acr_default_sw_init(struct gk20a *g, struct hs_acr *hs_acr)

8
drivers/gpu/nvgpu/tu104/acr_tu104.c
View File

@@ -120,8 +120,12 @@ static void tu104_free_hs_acr(struct gk20a *g,
nvgpu_release_firmware(g, acr_type->acr_hs_bl.hs_bl_fw);
}
nvgpu_dma_unmap_free(vm, &acr_type->acr_ucode);
nvgpu_dma_unmap_free(vm, &acr_type->acr_hs_bl.hs_bl_ucode);
if (nvgpu_mem_is_valid(&acr_type->acr_ucode)) {
nvgpu_dma_unmap_free(vm, &acr_type->acr_ucode);
}
if (nvgpu_mem_is_valid(&acr_type->acr_hs_bl.hs_bl_ucode)) {
nvgpu_dma_unmap_free(vm, &acr_type->acr_hs_bl.hs_bl_ucode);
}
}
static void tu104_remove_acr_support(struct nvgpu_acr *acr)