drm/amdgpu: Avoid using signed integer to store pointer value
Subsystems (2)
PATCH 1/2 drm/amdgpu: Avoid using signed integer to store pointer value
Change-Id I861ba3c85c182fdb6b89533029b3272191f331f5
Signed-off-by Alex Xie <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +1 -1
@@ -237,7 +237,7 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,struct amdgpu_fpriv *fpriv = filp->driver_priv;union drm_amdgpu_bo_list *args = data;uint32_t handle = args->in.list_handle; -const void __user *uptr = (const void *)(long )args->in.bo_info_ptr; +const void __user *uptr = (const void *)(uintptr_t )args->in.bo_info_ptr;struct drm_amdgpu_bo_list_entry *info;struct amdgpu_bo_list *list;
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -1
@@ -719,7 +719,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,switch (args->op) {case AMDGPU_GEM_OP_GET_GEM_CREATE_INFO : {struct drm_amdgpu_gem_create_in info; -void __user *out = (void __user *)(long )args->value; +void __user *out = (void __user *)(uintptr_t )args->value; info.bo_size = robj->gem_base.size; info.alignment = robj->tbo.mem.page_alignment <<PAGE_SHIFT ;
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -237,7 +237,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_filestruct amdgpu_device *adev = dev->dev_private;struct drm_amdgpu_info *info = data;struct amdgpu_mode_info *minfo = &adev->mode_info; -void __user *out = (void __user *)(long )info->return_pointer; +void __user *out = (void __user *)(uintptr_t )info->return_pointer;uint32_t size = info->return_size;struct drm_crtc *crtc;uint32_t ui32 =0 ;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1491427439-20303-1-git-send-email-AlexBin.Xie-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: use uintptr_t instead of unsigned long to store pointer
Change-Id Ic1cb6252482bcf9602c7700c3db075b9edf20e2a
Signed-off-by Alex Xie <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -4
@@ -161,7 +161,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) }/* get chunks */ - chunk_array_user = (uint64_t __user *)(unsigned long )(cs->in.chunks); + chunk_array_user = (uint64_t __user *)(uintptr_t )(cs->in.chunks);if (copy_from_user (chunk_array, chunk_array_user,sizeof (uint64_t )*cs->in.num_chunks)) { ret = -EFAULT ;
@@ -181,7 +181,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)struct drm_amdgpu_cs_chunk user_chunk;uint32_t __user *cdata; - chunk_ptr = (void __user *)(unsigned long )chunk_array[i]; + chunk_ptr = (void __user *)(uintptr_t )chunk_array[i];if (copy_from_user (&user_chunk, chunk_ptr,sizeof (struct drm_amdgpu_cs_chunk ))) { ret = -EFAULT ;
@@ -192,7 +192,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) p->chunks[i].length_dw = user_chunk.length_dw; size = p->chunks[i].length_dw; - cdata = (void __user *)(unsigned long )user_chunk.chunk_data; + cdata = (void __user *)(uintptr_t )user_chunk.chunk_data; p->chunks[i].kdata =drm_malloc_ab (size,sizeof (uint32_t ));if (p->chunks[i].kdata ==NULL ) {
@@ -1339,7 +1339,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data,if (fences ==NULL )return -ENOMEM ; - fences_user = (void __user *)(unsigned long )(wait->in.fences); + fences_user = (void __user *)(uintptr_t )(wait->in.fences);if (copy_from_user (fences, fences_user,sizeof (struct drm_amdgpu_fence ) * fence_count)) { r = -EFAULT ;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx