* [PATCH -next] crypto: hisilicon -: switch to memdup_user_nul()
@ 2021-05-11 6:37 Zou Wei
2021-05-11 7:07 ` Zhou Wang
0 siblings, 1 reply; 3+ messages in thread
From: Zou Wei @ 2021-05-11 6:37 UTC (permalink / raw)
To: wangzhou1, herbert, davem; +Cc: linux-crypto, linux-kernel, Zou Wei
Use memdup_user_nul() helper instead of open-coding to
simplify the code.
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
---
drivers/crypto/hisilicon/qm.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index ce439a0..83a5d30 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -1570,17 +1570,10 @@ static ssize_t qm_cmd_write(struct file *filp, const char __user *buffer,
if (count > QM_DBG_WRITE_LEN)
return -ENOSPC;
- cmd_buf = kzalloc(count + 1, GFP_KERNEL);
- if (!cmd_buf)
+ cmd_buf = memdup_user_nul(buffer, count);
+ if (IS_ERR(cmd_buf))
return -ENOMEM;
- if (copy_from_user(cmd_buf, buffer, count)) {
- kfree(cmd_buf);
- return -EFAULT;
- }
-
- cmd_buf[count] = '\0';
-
cmd_buf_tmp = strchr(cmd_buf, '\n');
if (cmd_buf_tmp) {
*cmd_buf_tmp = '\0';
--
2.6.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] crypto: hisilicon -: switch to memdup_user_nul()
2021-05-11 6:37 [PATCH -next] crypto: hisilicon -: switch to memdup_user_nul() Zou Wei
@ 2021-05-11 7:07 ` Zhou Wang
2021-05-12 7:04 ` Samuel Zou
0 siblings, 1 reply; 3+ messages in thread
From: Zhou Wang @ 2021-05-11 7:07 UTC (permalink / raw)
To: Zou Wei, herbert, davem; +Cc: linux-crypto, linux-kernel
On 2021/5/11 14:37, Zou Wei wrote:
> Use memdup_user_nul() helper instead of open-coding to
> simplify the code.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zou Wei <zou_wei@huawei.com>
> ---
> drivers/crypto/hisilicon/qm.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
> index ce439a0..83a5d30 100644
> --- a/drivers/crypto/hisilicon/qm.c
> +++ b/drivers/crypto/hisilicon/qm.c
> @@ -1570,17 +1570,10 @@ static ssize_t qm_cmd_write(struct file *filp, const char __user *buffer,
> if (count > QM_DBG_WRITE_LEN)
> return -ENOSPC;
>
> - cmd_buf = kzalloc(count + 1, GFP_KERNEL);
> - if (!cmd_buf)
> + cmd_buf = memdup_user_nul(buffer, count);
> + if (IS_ERR(cmd_buf))
> return -ENOMEM;
>
> - if (copy_from_user(cmd_buf, buffer, count)) {
> - kfree(cmd_buf);
> - return -EFAULT;
> - }
> -
> - cmd_buf[count] = '\0';
> -
> cmd_buf_tmp = strchr(cmd_buf, '\n');
> if (cmd_buf_tmp) {
> *cmd_buf_tmp = '\0';
>
It is fine to me, thanks!
BTW, normally we use crypto: hisilicon - switch to memdup_user_nul() as the subject line,
just like other patches :)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] crypto: hisilicon -: switch to memdup_user_nul()
2021-05-11 7:07 ` Zhou Wang
@ 2021-05-12 7:04 ` Samuel Zou
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Zou @ 2021-05-12 7:04 UTC (permalink / raw)
To: Zhou Wang, herbert, davem; +Cc: linux-crypto, linux-kernel
Hi,
Sorry for the mistake, I will send v2 soon.
On 2021/5/11 15:07, Zhou Wang wrote:
> On 2021/5/11 14:37, Zou Wei wrote:
>> Use memdup_user_nul() helper instead of open-coding to
>> simplify the code.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Zou Wei <zou_wei@huawei.com>
>> ---
>> drivers/crypto/hisilicon/qm.c | 11 ++---------
>> 1 file changed, 2 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
>> index ce439a0..83a5d30 100644
>> --- a/drivers/crypto/hisilicon/qm.c
>> +++ b/drivers/crypto/hisilicon/qm.c
>> @@ -1570,17 +1570,10 @@ static ssize_t qm_cmd_write(struct file *filp, const char __user *buffer,
>> if (count > QM_DBG_WRITE_LEN)
>> return -ENOSPC;
>>
>> - cmd_buf = kzalloc(count + 1, GFP_KERNEL);
>> - if (!cmd_buf)
>> + cmd_buf = memdup_user_nul(buffer, count);
>> + if (IS_ERR(cmd_buf))
>> return -ENOMEM;
>>
>> - if (copy_from_user(cmd_buf, buffer, count)) {
>> - kfree(cmd_buf);
>> - return -EFAULT;
>> - }
>> -
>> - cmd_buf[count] = '\0';
>> -
>> cmd_buf_tmp = strchr(cmd_buf, '\n');
>> if (cmd_buf_tmp) {
>> *cmd_buf_tmp = '\0';
>>
>
> It is fine to me, thanks!
>
> BTW, normally we use crypto: hisilicon - switch to memdup_user_nul() as the subject line,
> just like other patches :)
>
> .
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-12 7:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-11 6:37 [PATCH -next] crypto: hisilicon -: switch to memdup_user_nul() Zou Wei
2021-05-11 7:07 ` Zhou Wang
2021-05-12 7:04 ` Samuel Zou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).