diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2021-03-02 21:33:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:57:16 +0200 |
| commit | 417ec24258f6060a9962bc84d11351384bea006a (patch) | |
| tree | 95da6f3017a981a3ae4bb99a24ea568c2dce570b /crypto | |
| parent | c0e5510b5ae4be9d6b040fb890e15ea22ad00354 (diff) | |
| download | linux-417ec24258f6060a9962bc84d11351384bea006a.tar.gz linux-417ec24258f6060a9962bc84d11351384bea006a.tar.bz2 linux-417ec24258f6060a9962bc84d11351384bea006a.zip | |
crypto: api - check for ERR pointers in crypto_destroy_tfm()
[ Upstream commit 83681f2bebb34dbb3f03fecd8f570308ab8b7c2c ]
Given that crypto_alloc_tfm() may return ERR pointers, and to avoid
crashes on obscure error paths where such pointers are presented to
crypto_destroy_tfm() (such as [0]), add an ERR_PTR check there
before dereferencing the second argument as a struct crypto_tfm
pointer.
[0] https://lore.kernel.org/linux-crypto/000000000000de949705bc59e0f6@google.com/
Reported-by: syzbot+12cf5fbfdeba210a89dd@syzkaller.appspotmail.com
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c index 187795a6687d..99bd438fa4a4 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -567,7 +567,7 @@ void crypto_destroy_tfm(void *mem, struct crypto_tfm *tfm) { struct crypto_alg *alg; - if (unlikely(!mem)) + if (IS_ERR_OR_NULL(mem)) return; alg = tfm->__crt_alg; |