raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

rapidio/rio_mport_cdev: use array_size() helper in copy_{from,to}_user()

Browse Source 
Use array_size() helper instead of the open-coded version in
copy_{from,to}_user().  These sorts of multiplication factors need to be
wrapped in array_size().

This issue was found with the help of Coccinelle and, audited and fixed
manually.

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Link: http://lkml.kernel.org/r/20200616183050.GA31840@embeddedor
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Gustavo A. R. Silva
2020-08-11 18:36:43 -07:00
committed by Linus Torvalds
parent 330d558960
commit d71375499d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/rapidio/devices/rio_mport_cdev.c
View File

@@ -981,7 +981,7 @@ static int rio_mport_transfer_ioctl(struct file *filp, void __user *arg)
if (unlikely(copy_from_user(transfer, if (unlikely(copy_from_user(transfer,
(void __user *)(uintptr_t)transaction.block, (void __user *)(uintptr_t)transaction.block,
transaction.count * sizeof(*transfer)))) { array_size(sizeof(*transfer), transaction.count)))) {
ret = -EFAULT; ret = -EFAULT;
goto out_free; goto out_free;
} }
@@ -994,7 +994,7 @@ static int rio_mport_transfer_ioctl(struct file *filp, void __user *arg)
if (unlikely(copy_to_user((void __user *)(uintptr_t)transaction.block, if (unlikely(copy_to_user((void __user *)(uintptr_t)transaction.block,
transfer, transfer,
transaction.count * sizeof(*transfer)))) array_size(sizeof(*transfer), transaction.count))))
ret = -EFAULT; ret = -EFAULT;
out_free: out_free: