2018-08-13 12:57:02

by zhong jiang

Subject: [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.

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-08-13 14:51:30

by Don Brace

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

> -----Original Message-----
> From: zhong jiang [mailto:[email protected]]
> Sent: Monday, August 13, 2018 7:43 AM
> To: [email protected]; [email protected];
> [email protected]
> Cc: [email protected]
> Subject: [PATCH v2] scsi: Use vmemdup_user to replace the open code
>
> EXTERNAL EMAIL
>
>
> EXTERNAL EMAIL
>
>
> vmemdup_user is better than duplicating its implementation, So just
> replace the open code.
>
> The issue is detected with the help of Coccinelle.
>
> Signed-off-by: zhong jiang <[email protected]>
Tested-by: Don Brace <[email protected]>
Acked-by: Don Brace <[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-08-23 16:14:46

by zhong jiang

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

On 2018/8/13 22:20, [email protected] wrote:
>> -----Original Message-----
>> From: zhong jiang [mailto:[email protected]]
>> Sent: Monday, August 13, 2018 7:43 AM
>> To: [email protected]; [email protected];
>> [email protected]
>> Cc: [email protected]
>> Subject: [PATCH v2] scsi: Use vmemdup_user to replace the open code
>>
>> EXTERNAL EMAIL
>>
>>
>> EXTERNAL EMAIL
>>
>>
>> vmemdup_user is better than duplicating its implementation, So just
>> replace the open code.
>>
>> The issue is detected with the help of Coccinelle.
>>
>> Signed-off-by: zhong jiang <[email protected]>
> Tested-by: Don Brace <[email protected]>
> Acked-by: Don Brace <[email protected]>
Thanks Don for your test and ack.

Martin , Can you pick up the patch, Thanks

Best wishes,
zhong jiang
>> ---
>> 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-18 15:02:49

by zhong jiang

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

Hi, Greg

Can you pick up the patch?

Thanks,
zhong jiang

On 2018/8/23 19:38, zhong jiang wrote:
> On 2018/8/13 22:20, [email protected] wrote:
>>> -----Original Message-----
>>> From: zhong jiang [mailto:[email protected]]
>>> Sent: Monday, August 13, 2018 7:43 AM
>>> To: [email protected]; [email protected];
>>> [email protected]
>>> Cc: [email protected]
>>> Subject: [PATCH v2] scsi: Use vmemdup_user to replace the open code
>>>
>>> EXTERNAL EMAIL
>>>
>>>
>>> EXTERNAL EMAIL
>>>
>>>
>>> vmemdup_user is better than duplicating its implementation, So just
>>> replace the open code.
>>>
>>> The issue is detected with the help of Coccinelle.
>>>
>>> Signed-off-by: zhong jiang <[email protected]>
>> Tested-by: Don Brace <[email protected]>
>> Acked-by: Don Brace <[email protected]>
> Thanks Don for your test and ack.
>
> Martin , Can you pick up the patch, Thanks
>
> Best wishes,
> zhong jiang
>>> ---
>>> 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-18 15:11:11

by Martin K. Petersen

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

Hi Zhong,

> Can you pick up the patch?

Please submit SCSI patches to [email protected] so they get
tracked in patchwork.

Thank you!

--
Martin K. Petersen Oracle Linux Engineering

2018-09-18 15:11:54

by Greg Kroah-Hartman

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

On Tue, Sep 18, 2018 at 11:00:37PM +0800, zhong jiang wrote:
> Hi, Greg
>
> Can you pick up the patch?

Nope, sorry, as before, work with the maintainers please.

greg k-h

2018-09-18 15:16:57

by zhong jiang

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

On 2018/9/18 23:09, Martin K. Petersen wrote:
> Hi Zhong,
>
>> Can you pick up the patch?
> Please submit SCSI patches to [email protected] so they get
> tracked in patchwork.
Ok, Should I resend the patch ?

Thanks,
zhong jiang
> Thank you!
>

2018-09-18 15:35:33

by zhong jiang

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

On 2018/9/18 23:10, Greg KH wrote:
> On Tue, Sep 18, 2018 at 11:00:37PM +0800, zhong jiang wrote:
>> Hi, Greg
>>
>> Can you pick up the patch?
> Nope, sorry, as before, work with the maintainers please.
Thank you for your reply timely .:-)

Sincerely,
zhong jiang
> greg k-h
>
> .
>