summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/hisilicon
diff options
context:
space:
mode:
authorThomas Zimmermann2019-02-07 09:59:30 +0100
committerAlex Deucher2019-03-19 21:03:53 +0100
commitbed2dd84212eb0151ae3bfc39cdaa25a951749c1 (patch)
treeda3155580e0fa7b603bb4fbdb163fcdf497f5ffd /drivers/gpu/drm/hisilicon
parentdrm/ttm: Remove file_page_offset parameter from ttm_bo_device_init() (diff)
downloadkernel-qcow2-linux-bed2dd84212eb0151ae3bfc39cdaa25a951749c1.tar.gz
kernel-qcow2-linux-bed2dd84212eb0151ae3bfc39cdaa25a951749c1.tar.xz
kernel-qcow2-linux-bed2dd84212eb0151ae3bfc39cdaa25a951749c1.zip
drm/ttm: Quick-test mmap offset in ttm_bo_mmap()
A BO's address has to be at least the minimum offset. Sharing this test in ttm_bo_mmap() removes code from drivers. A full buffer-address validation is still done within drm_vma_offset_lockup_locked(). Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/hisilicon')
-rw-r--r--drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 845488922865..6093c421daff 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -319,14 +319,9 @@ int hibmc_bo_unpin(struct hibmc_bo *bo)
int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
{
- struct drm_file *file_priv;
- struct hibmc_drm_private *hibmc;
+ struct drm_file *file_priv = filp->private_data;
+ struct hibmc_drm_private *hibmc = file_priv->minor->dev->dev_private;
- if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
- return -EINVAL;
-
- file_priv = filp->private_data;
- hibmc = file_priv->minor->dev->dev_private;
return ttm_bo_mmap(filp, vma, &hibmc->bdev);
}