Use memdup_user() rather than duplicating its implementation. This is a
little bit restricted to reduce false positives.
./drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:2813:13-20: WARNING opportunity for memdup_user.
Reported-by: Abaci Robot <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5523
Signed-off-by: Jiapeng Chong <[email protected]>
---
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index d6b15493fffd..637962d4083c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -2810,12 +2810,9 @@ static uint32_t *get_queue_ids(uint32_t num_queues, uint32_t *usr_queue_id_array
if (!usr_queue_id_array)
return NULL;
- queue_ids = kzalloc(array_size, GFP_KERNEL);
- if (!queue_ids)
- return ERR_PTR(-ENOMEM);
-
- if (copy_from_user(queue_ids, usr_queue_id_array, array_size))
- return ERR_PTR(-EFAULT);
+ queue_ids = memdup_user(usr_queue_id_array, array_size);
+ if (IS_ERR(queue_ids))
+ return PTR_ERR(queue_ids);
return queue_ids;
}
--
2.20.1.7.g153144c
Hi Jiapeng,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20230613]
[cannot apply to drm-misc/drm-misc-next v6.4-rc6 v6.4-rc5 v6.4-rc4 linus/master v6.4-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/drm-amdkfd-Switch-over-to-memdup_user/20230614-100553
base: next-20230613
patch link: https://lore.kernel.org/r/20230614020432.44044-1-jiapeng.chong%40linux.alibaba.com
patch subject: [PATCH] drm/amdkfd: Switch over to memdup_user()
config: x86_64-buildonly-randconfig-r006-20230614 (https://download.01.org/0day-ci/archive/20230614/[email protected]/config)
compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout next-20230613
b4 shazam https://lore.kernel.org/r/[email protected]
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:2815:10: error: incompatible integer to pointer conversion returning 'long' from a function with result type 'uint32_t *' (aka 'unsigned int *') [-Wint-conversion]
return PTR_ERR(queue_ids);
^~~~~~~~~~~~~~~~~~
1 error generated.
vim +2815 drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c
2804
2805 static uint32_t *get_queue_ids(uint32_t num_queues, uint32_t *usr_queue_id_array)
2806 {
2807 size_t array_size = num_queues * sizeof(uint32_t);
2808 uint32_t *queue_ids = NULL;
2809
2810 if (!usr_queue_id_array)
2811 return NULL;
2812
2813 queue_ids = memdup_user(usr_queue_id_array, array_size);
2814 if (IS_ERR(queue_ids))
> 2815 return PTR_ERR(queue_ids);
2816
2817 return queue_ids;
2818 }
2819
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Am 2023-06-13 um 22:04 schrieb Jiapeng Chong:
> Use memdup_user() rather than duplicating its implementation. This is a
> little bit restricted to reduce false positives.
>
> ./drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:2813:13-20: WARNING opportunity for memdup_user.
>
> Reported-by: Abaci Robot <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5523
> Signed-off-by: Jiapeng Chong <[email protected]>
Kernel test robot is reporting a failure with this patch, looks like you
used PTR_ERR incorrectly. Please make sure your patch compiles without
warnings.
I see more opportunities to use memdup_user in kfd_chardev.c,
kfd_events.c, kfd_process_queue_manager.c and kfd_svm.c. Do you want to
fix those, too, while you're at it?
Thanks,
Felix
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> index d6b15493fffd..637962d4083c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> @@ -2810,12 +2810,9 @@ static uint32_t *get_queue_ids(uint32_t num_queues, uint32_t *usr_queue_id_array
> if (!usr_queue_id_array)
> return NULL;
>
> - queue_ids = kzalloc(array_size, GFP_KERNEL);
> - if (!queue_ids)
> - return ERR_PTR(-ENOMEM);
> -
> - if (copy_from_user(queue_ids, usr_queue_id_array, array_size))
> - return ERR_PTR(-EFAULT);
> + queue_ids = memdup_user(usr_queue_id_array, array_size);
> + if (IS_ERR(queue_ids))
> + return PTR_ERR(queue_ids);
>
> return queue_ids;
> }
Hi Jiapeng,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20230613]
[cannot apply to drm-misc/drm-misc-next v6.4-rc6 v6.4-rc5 v6.4-rc4 linus/master v6.4-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/drm-amdkfd-Switch-over-to-memdup_user/20230614-100553
base: next-20230613
patch link: https://lore.kernel.org/r/20230614020432.44044-1-jiapeng.chong%40linux.alibaba.com
patch subject: [PATCH] drm/amdkfd: Switch over to memdup_user()
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20230615/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
git checkout next-20230613
b4 shazam https://lore.kernel.org/r/[email protected]
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c: In function 'get_queue_ids':
>> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:2815:24: warning: returning 'long int' from a function with return type 'uint32_t *' {aka 'unsigned int *'} makes pointer from integer without a cast [-Wint-conversion]
2815 | return PTR_ERR(queue_ids);
| ^~~~~~~~~~~~~~~~~~
vim +2815 drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c
2804
2805 static uint32_t *get_queue_ids(uint32_t num_queues, uint32_t *usr_queue_id_array)
2806 {
2807 size_t array_size = num_queues * sizeof(uint32_t);
2808 uint32_t *queue_ids = NULL;
2809
2810 if (!usr_queue_id_array)
2811 return NULL;
2812
2813 queue_ids = memdup_user(usr_queue_id_array, array_size);
2814 if (IS_ERR(queue_ids))
> 2815 return PTR_ERR(queue_ids);
2816
2817 return queue_ids;
2818 }
2819
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki