2021-11-04 13:40:08

by YE Chengfeng

Subject: [PATCH] crypto: qce: fix uaf on qce_ahash_register_one

Pointer base points to sub field of tmpl, it
is dereferenced after tmpl is freed. Fix
this by accessing base before free tmpl.

Fixes: ec8f5d8f ("crypto: qce - Qualcomm crypto engine driver")
Signed-off-by: Chengfeng Ye <[email protected]>
---
drivers/crypto/qce/sha.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
index 8e6fcf2c21cc..59159f5e64e5 100644
--- a/drivers/crypto/qce/sha.c
+++ b/drivers/crypto/qce/sha.c
@@ -498,8 +498,8 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def,

ret = crypto_register_ahash(alg);
if (ret) {
- kfree(tmpl);
dev_err(qce->dev, "%s registration failed\n", base->cra_name);
+ kfree(tmpl);
return ret;
}

--
2.17.1

2021-11-05 21:10:15

by Thara Gopinath

Subject: Re: [PATCH] crypto: qce: fix uaf on qce_ahash_register_one

On 11/4/21 9:38 AM, Chengfeng Ye wrote:
> Pointer base points to sub field of tmpl, it
> is dereferenced after tmpl is freed. Fix
> this by accessing base before free tmpl.
>
> Fixes: ec8f5d8f ("crypto: qce - Qualcomm crypto engine driver")
> Signed-off-by: Chengfeng Ye <[email protected]>

Acked-by: Thara Gopinath <[email protected]>

> ---
> drivers/crypto/qce/sha.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
> index 8e6fcf2c21cc..59159f5e64e5 100644
> --- a/drivers/crypto/qce/sha.c
> +++ b/drivers/crypto/qce/sha.c
> @@ -498,8 +498,8 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def,
>
> ret = crypto_register_ahash(alg);
> if (ret) {
> - kfree(tmpl);
> dev_err(qce->dev, "%s registration failed\n", base->cra_name);
> + kfree(tmpl);
> return ret;
> }
>
>

--
Warm Regards
Thara (She/Her/Hers)

2021-11-20 04:30:42

by Herbert Xu

Subject: Re: [PATCH] crypto: qce: fix uaf on qce_ahash_register_one

On Thu, Nov 04, 2021 at 06:38:31AM -0700, Chengfeng Ye wrote:
> Pointer base points to sub field of tmpl, it
> is dereferenced after tmpl is freed. Fix
> this by accessing base before free tmpl.
>
> Fixes: ec8f5d8f ("crypto: qce - Qualcomm crypto engine driver")
> Signed-off-by: Chengfeng Ye <[email protected]>
> ---
> drivers/crypto/qce/sha.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt