2018-09-18 16:10:47

by zhong jiang

Subject: [RESEND PATCH v2] scsi: Use vmemdup_user to replace the open code

vmemdup_user is better than duplicating its implementation, So just
replace the open code.

The issue is detected with the help of Coccinelle.

Tested-by: Don Brace <[email protected]>
Acked-by: Don Brace <[email protected]>
Signed-off-by: zhong jiang <[email protected]>
---
drivers/scsi/hpsa.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 58bb70b..666ba09e5 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6381,13 +6381,9 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
return -EINVAL;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
- ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
- if (!ioc) {
- status = -ENOMEM;
- goto cleanup1;
- }
- if (copy_from_user(ioc, argp, sizeof(*ioc))) {
- status = -EFAULT;
+ ioc = vmemdup_user(argp, sizeof(*ioc));
+ if (IS_ERR(ioc)) {
+ status = PTR_ERR(ioc);
goto cleanup1;
}
if ((ioc->buf_size < 1) &&
@@ -6505,7 +6501,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
kfree(buff);
}
kfree(buff_size);
- kfree(ioc);
+ kvfree(ioc);
return status;
}

--
1.7.12.4

2018-09-21 14:17:29

by zhong jiang

Subject: Re: [RESEND PATCH v2] scsi: Use vmemdup_user to replace the open code

Hi, martin

Can you pick up the patch? Thanks,

Sincerely,
zhong jiang

On 2018/9/18 23:54, zhong jiang wrote:
> vmemdup_user is better than duplicating its implementation, So just
> replace the open code.
>
> The issue is detected with the help of Coccinelle.
>
> Tested-by: Don Brace <[email protected]>
> Acked-by: Don Brace <[email protected]>
> Signed-off-by: zhong jiang <[email protected]>
> ---
> drivers/scsi/hpsa.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 58bb70b..666ba09e5 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -6381,13 +6381,9 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
> return -EINVAL;
> if (!capable(CAP_SYS_RAWIO))
> return -EPERM;
> - ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
> - if (!ioc) {
> - status = -ENOMEM;
> - goto cleanup1;
> - }
> - if (copy_from_user(ioc, argp, sizeof(*ioc))) {
> - status = -EFAULT;
> + ioc = vmemdup_user(argp, sizeof(*ioc));
> + if (IS_ERR(ioc)) {
> + status = PTR_ERR(ioc);
> goto cleanup1;
> }
> if ((ioc->buf_size < 1) &&
> @@ -6505,7 +6501,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
> kfree(buff);
> }
> kfree(buff_size);
> - kfree(ioc);
> + kvfree(ioc);
> return status;
> }
>

2018-09-26 00:46:30

by Martin K. Petersen

Subject: Re: [RESEND PATCH v2] scsi: Use vmemdup_user to replace the open code

zhong,

> vmemdup_user is better than duplicating its implementation, So just
> replace the open code.

Applied to 4.20/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering