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

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

[zhong jiang]

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 <zhongjiang@huawei.com>
---
 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

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

[Don.Brace]

> -----Original Message-----
> From: zhong jiang [mailto:zhongjiang@huawei.com]
> Sent: Monday, August 13, 2018 7:43 AM
> To: don.brace@microsemi.com; jejb@linux.vnet.ibm.com;
> martin.petersen@oracle.com
> Cc: linux-kernel@vger.kernel.org
> 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 <zhongjiang@huawei.com>
Tested-by: Don Brace <don.brace@microsemi.com>
Acked-by: Don Brace <don.brace@microsemi.com>

> ---
>  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

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

[zhong jiang]

On 2018/8/13 22:20, Don.Brace@microchip.com wrote:
>> -----Original Message-----
>> From: zhong jiang [mailto:zhongjiang@huawei.com]
>> Sent: Monday, August 13, 2018 7:43 AM
>> To: don.brace@microsemi.com; jejb@linux.vnet.ibm.com;
>> martin.petersen@oracle.com
>> Cc: linux-kernel@vger.kernel.org
>> 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 <zhongjiang@huawei.com>
> Tested-by: Don Brace <don.brace@microsemi.com>
> Acked-by: Don Brace <don.brace@microsemi.com>
 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
>
>

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

[zhong jiang]

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, Don.Brace@microchip.com wrote:
>>> -----Original Message-----
>>> From: zhong jiang [mailto:zhongjiang@huawei.com]
>>> Sent: Monday, August 13, 2018 7:43 AM
>>> To: don.brace@microsemi.com; jejb@linux.vnet.ibm.com;
>>> martin.petersen@oracle.com
>>> Cc: linux-kernel@vger.kernel.org
>>> 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 <zhongjiang@huawei.com>
>> Tested-by: Don Brace <don.brace@microsemi.com>
>> Acked-by: Don Brace <don.brace@microsemi.com>
>  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
>>
>
>
> .
>

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

[Martin K. Petersen]

Hi Zhong,

> Can you pick up the patch?

Please submit SCSI patches to linux-scsi@vger.kernel.org so they get
tracked in patchwork.

Thank you!

-- 
Martin K. Petersen	Oracle Linux Engineering

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

[Greg KH]

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

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

[zhong jiang]

On 2018/9/18 23:09, Martin K. Petersen wrote:
> Hi Zhong,
>
>> Can you pick up the patch?
> Please submit SCSI patches to linux-scsi@vger.kernel.org so they get
> tracked in patchwork.
Ok,   Should I resend the patch ? 

Thanks,
zhong jiang
> Thank you!
>

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

[zhong jiang]

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
>
> .
>