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

gpu: nvgpu: fix the return value from gk20a_mm_pin

Browse Source 
The return value in case of failure of dma_buf_attach and
dma_buf_map_attachment was ignored and NULL was returned.
This would lead to following null pointer access. Fix it.

[  293.622880] Unable to handle kernel NULL pointer dereference
               at virtual address 0000000000000000
...
[  293.711860] Hardware name: quill (DT)
[  293.720393] pc : nvgpu_linux_sgt_create+0x14/0xa8 [nvgpu]
[  293.725871] lr : nvgpu_vm_map_linux+0x104/0x1c8 [nvgpu]
...
[  293.813934] Call trace:
[  293.816455]  nvgpu_linux_sgt_create+0x14/0xa8 [nvgpu]
[  293.821573]  nvgpu_vm_map_linux+0x104/0x1c8 [nvgpu]
[  293.826515]  nvgpu_vm_map_buffer+0x120/0x290 [nvgpu]
[  293.831542]  gk20a_as_dev_ioctl+0x364/0xfb8 [nvgpu]
[  293.836416]  ksys_ioctl+0x17c/0xba8
[  293.839899]  __arm64_sys_ioctl+0x18/0x28
[  293.843817]  do_el0_svc+0xf8/0x1b8
[  293.847214]  el0_sync_handler+0x11c/0x28c
[  293.851217]  el0_sync+0x140/0x180

Bug 2834141

Change-Id: I0d9e863d0326946c8091bfb1b907b62b055f7272
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2332204
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Sagar Kamble
2020-04-21 17:08:00 +05:30
committed by Alex Waterman
parent 8e9d837fd5
commit 9f8d5acfbb
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/nvgpu/os/linux/dmabuf.c
View File

@@ -66,17 +66,22 @@ struct sg_table *gk20a_mm_pin(struct device *dev, struct dma_buf *dmabuf,
return gk20a_mm_pin_has_drvdata(dev, dmabuf, attachment);
#else
struct dma_buf_attachment *attach = NULL;
struct gk20a *g = get_gk20a(dev);
struct sg_table *sgt = NULL;
attach = dma_buf_attach(dmabuf, dev);
if (IS_ERR(attach)) {
return NULL;
nvgpu_err(g, "Failed to attach dma_buf (err = %ld)!",
PTR_ERR(attach));
return ERR_CAST(attach);
}
sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
if (IS_ERR(sgt)) {
dma_buf_detach(dmabuf, attach);
return NULL;
nvgpu_err(g, "Failed to map attachment (err = %ld)!",
PTR_ERR(sgt));
return ERR_CAST(sgt);
}
*attachment = attach;