th the help of Coccinelle. We find some place to replace. @@ expression M, S; @@ - memset(M, 0, S); - kfree(M); + kzfree(M); zhong jiang (3): crypto: marvell: Use kzfree rather than its implementation iommu/pamu: Use kzfree rather than its implementation Staging: rtl8723bs: Use kzfree rather than its implementation drivers/crypto/marvell/hash.c | 3 +-- drivers/iommu/fsl_pamu.c | 6 ++---- drivers/staging/rtl8723bs/core/rtw_security.c | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) -- 1.7.12.4
Use kzfree instead of memset() + kfree(). Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/crypto/marvell/hash.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c index 0f0ac85..a2b35fb 100644 --- a/drivers/crypto/marvell/hash.c +++ b/drivers/crypto/marvell/hash.c @@ -1148,8 +1148,7 @@ static int mv_cesa_ahmac_pad_init(struct ahash_request *req, } /* Set the memory region to 0 to avoid any leak. */ - memset(keydup, 0, keylen); - kfree(keydup); + kzfree(keydup); if (ret) return ret; -- 1.7.12.4
Use kzfree instead of memset() + kfree(). Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/iommu/fsl_pamu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index cde281b..ca6d147 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c @@ -1174,10 +1174,8 @@ static int fsl_pamu_probe(struct platform_device *pdev) if (irq != NO_IRQ) free_irq(irq, data); - if (data) { - memset(data, 0, sizeof(struct pamu_isr_data)); - kfree(data); - } + if (data) + kzfree(data); if (pamu_regs) iounmap(pamu_regs); -- 1.7.12.4
Use kzfree instead of memset() + kfree(). Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/staging/rtl8723bs/core/rtw_security.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index 979056c..57cfe06 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -2290,8 +2290,7 @@ static void gf_mulx(u8 *pad) static void aes_encrypt_deinit(void *ctx) { - memset(ctx, 0, AES_PRIV_SIZE); - kfree(ctx); + kzfree(ctx); } -- 1.7.12.4
On Wed, Sep 04, 2019 at 11:01:18AM +0800, zhong jiang wrote:
> Use kzfree instead of memset() + kfree().
>
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
> ---
> drivers/iommu/fsl_pamu.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> index cde281b..ca6d147 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -1174,10 +1174,8 @@ static int fsl_pamu_probe(struct platform_device *pdev)
> if (irq != NO_IRQ)
> free_irq(irq, data);
>
> - if (data) {
> - memset(data, 0, sizeof(struct pamu_isr_data));
> - kfree(data);
> - }
> + if (data)
> + kzfree(data);
kzfree() is doing its own NULL-ptr check, no need to do it here.
Regards,
Joerg
On 2019/9/4 16:15, Joerg Roedel wrote: > On Wed, Sep 04, 2019 at 11:01:18AM +0800, zhong jiang wrote: >> Use kzfree instead of memset() + kfree(). >> >> Signed-off-by: zhong jiang <zhongjiang@huawei.com> >> --- >> drivers/iommu/fsl_pamu.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c >> index cde281b..ca6d147 100644 >> --- a/drivers/iommu/fsl_pamu.c >> +++ b/drivers/iommu/fsl_pamu.c >> @@ -1174,10 +1174,8 @@ static int fsl_pamu_probe(struct platform_device *pdev) >> if (irq != NO_IRQ) >> free_irq(irq, data); >> >> - if (data) { >> - memset(data, 0, sizeof(struct pamu_isr_data)); >> - kfree(data); >> - } >> + if (data) >> + kzfree(data); > kzfree() is doing its own NULL-ptr check, no need to do it here. Yep, we should also remove the condition before kzfree. will repost. Thanks, zhong jiang > Regards, > > Joerg
On Wed, Sep 04, 2019 at 11:01:17AM +0800, zhong jiang wrote: > Use kzfree instead of memset() + kfree(). > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> > --- > drivers/crypto/marvell/hash.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Patch applied. Thanks. -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt