2023-06-13 01:36:28

by Jiapeng Chong

Subject: [PATCH v2] tee: optee: Use kmemdup() to replace kmalloc + memcpy

Use kmemdup rather than duplicating its implementation.

./drivers/tee/optee/smc_abi.c:1542:12-19: WARNING opportunity for kmemdup.

Reported-by: Abaci Robot <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5480
Signed-off-by: Jiapeng Chong <[email protected]>
---
Changes in v2:
-Add one commit message.

drivers/tee/optee/smc_abi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 3861ae06d902..d5b28fd35d66 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1541,12 +1541,11 @@ static int optee_load_fw(struct platform_device *pdev,
* This uses the GFP_DMA flag to ensure we are allocated memory in the
* 32-bit space since TF-A cannot map memory beyond the 32-bit boundary.
*/
- data_buf = kmalloc(fw->size, GFP_KERNEL | GFP_DMA);
+ data_buf = kmemdup(fw->data, fw->size, GFP_KERNEL | GFP_DMA);
if (!data_buf) {
rc = -ENOMEM;
goto fw_err;
}
- memcpy(data_buf, fw->data, fw->size);
data_pa = virt_to_phys(data_buf);
reg_pair_from_64(&data_pa_high, &data_pa_low, data_pa);
reg_pair_from_64(&data_size_high, &data_size_low, data_size);
--
2.20.1.7.g153144c

2023-06-13 08:52:25

by Sumit Garg

Subject: Re: [PATCH v2] tee: optee: Use kmemdup() to replace kmalloc + memcpy

On Tue, 13 Jun 2023 at 06:49, Jiapeng Chong
<[email protected]> wrote:
>
> Use kmemdup rather than duplicating its implementation.
>
> ./drivers/tee/optee/smc_abi.c:1542:12-19: WARNING opportunity for kmemdup.
>
> Reported-by: Abaci Robot <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5480
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> Changes in v2:
> -Add one commit message.
>
> drivers/tee/optee/smc_abi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>

Reviewed-by: Sumit Garg <[email protected]>

-Sumit

> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index 3861ae06d902..d5b28fd35d66 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -1541,12 +1541,11 @@ static int optee_load_fw(struct platform_device *pdev,
> * This uses the GFP_DMA flag to ensure we are allocated memory in the
> * 32-bit space since TF-A cannot map memory beyond the 32-bit boundary.
> */
> - data_buf = kmalloc(fw->size, GFP_KERNEL | GFP_DMA);
> + data_buf = kmemdup(fw->data, fw->size, GFP_KERNEL | GFP_DMA);
> if (!data_buf) {
> rc = -ENOMEM;
> goto fw_err;
> }
> - memcpy(data_buf, fw->data, fw->size);
> data_pa = virt_to_phys(data_buf);
> reg_pair_from_64(&data_pa_high, &data_pa_low, data_pa);
> reg_pair_from_64(&data_size_high, &data_size_low, data_size);
> --
> 2.20.1.7.g153144c
>

2023-06-15 13:05:43

by Jens Wiklander

Subject: Re: [PATCH v2] tee: optee: Use kmemdup() to replace kmalloc + memcpy

On Tue, Jun 13, 2023 at 10:42 AM Sumit Garg <[email protected]> wrote:
>
> On Tue, 13 Jun 2023 at 06:49, Jiapeng Chong
> <[email protected]> wrote:
> >
> > Use kmemdup rather than duplicating its implementation.
> >
> > ./drivers/tee/optee/smc_abi.c:1542:12-19: WARNING opportunity for kmemdup.
> >
> > Reported-by: Abaci Robot <[email protected]>
> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5480
> > Signed-off-by: Jiapeng Chong <[email protected]>
> > ---
> > Changes in v2:
> > -Add one commit message.
> >
> > drivers/tee/optee/smc_abi.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
>
> Reviewed-by: Sumit Garg <[email protected]>

I'm picking up this.

Thanks,
Jens

>
> -Sumit
>
> > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> > index 3861ae06d902..d5b28fd35d66 100644
> > --- a/drivers/tee/optee/smc_abi.c
> > +++ b/drivers/tee/optee/smc_abi.c
> > @@ -1541,12 +1541,11 @@ static int optee_load_fw(struct platform_device *pdev,
> > * This uses the GFP_DMA flag to ensure we are allocated memory in the
> > * 32-bit space since TF-A cannot map memory beyond the 32-bit boundary.
> > */
> > - data_buf = kmalloc(fw->size, GFP_KERNEL | GFP_DMA);
> > + data_buf = kmemdup(fw->data, fw->size, GFP_KERNEL | GFP_DMA);
> > if (!data_buf) {
> > rc = -ENOMEM;
> > goto fw_err;
> > }
> > - memcpy(data_buf, fw->data, fw->size);
> > data_pa = virt_to_phys(data_buf);
> > reg_pair_from_64(&data_pa_high, &data_pa_low, data_pa);
> > reg_pair_from_64(&data_size_high, &data_size_low, data_size);
> > --
> > 2.20.1.7.g153144c
> >