2019-08-31 12:42:46

by Yue Haibing

Subject: [PATCH -next] scsi: ufs: Use kmemdup in ufshcd_read_string_desc()

Use kmemdup rather than duplicating its implementation

Signed-off-by: YueHaibing <[email protected]>
---
drivers/scsi/ufs/ufshcd.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index acf298da054c..6d5e2f5d8468 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3309,12 +3309,11 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
str[ret++] = '\0';

} else {
- str = kzalloc(uc_str->len, GFP_KERNEL);
+ str = kmemdup(uc_str, uc_str->len, GFP_KERNEL);
if (!str) {
ret = -ENOMEM;
goto out;
}
- memcpy(str, uc_str, uc_str->len);
ret = uc_str->len;
}
out:

2019-08-31 19:38:18

by Tomas Winkler

Subject: RE: [PATCH -next] scsi: ufs: Use kmemdup in ufshcd_read_string_desc()

> Use kmemdup rather than duplicating its implementation
>
> Signed-off-by: YueHaibing <[email protected]>
LGTM, ACK.
Tomas

> ---
> drivers/scsi/ufs/ufshcd.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index
> acf298da054c..6d5e2f5d8468 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -3309,12 +3309,11 @@ int ufshcd_read_string_desc(struct ufs_hba *hba,
> u8 desc_index,
> str[ret++] = '\0';
>
> } else {
> - str = kzalloc(uc_str->len, GFP_KERNEL);
> + str = kmemdup(uc_str, uc_str->len, GFP_KERNEL);
> if (!str) {
> ret = -ENOMEM;
> goto out;
> }
> - memcpy(str, uc_str, uc_str->len);
> ret = uc_str->len;
> }
> out:
>
>

2019-09-09 06:53:44

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: ufs: Use kmemdup in ufshcd_read_string_desc()

YueHaibing,

> Use kmemdup rather than duplicating its implementation

Applied to 5.4/scsi-queue. Thanks!

--
Martin K. Petersen Oracle Linux Engineering