diff options
| author | Kees Cook <keescook@chromium.org> | 2023-01-05 20:19:48 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2023-01-27 11:42:57 -0800 |
| commit | aa85923a954e7704bc9d3847dabeb8540aa98d13 (patch) | |
| tree | 6a7b93241b3853da3696f76f82ad0c177a21ce13 /drivers/crypto/hisilicon | |
| parent | 8500689095a39a8c245ba62709f5e8735668e535 (diff) | |
| download | linux-stable-aa85923a954e7704bc9d3847dabeb8540aa98d13.tar.gz linux-stable-aa85923a954e7704bc9d3847dabeb8540aa98d13.tar.bz2 linux-stable-aa85923a954e7704bc9d3847dabeb8540aa98d13.zip | |
crypto: hisilicon: Wipe entire pool on error
To work around a Clang __builtin_object_size bug that shows up under
CONFIG_FORTIFY_SOURCE and UBSAN_BOUNDS, move the per-loop-iteration
mem_block wipe into a single wipe of the entire pool structure after
the loop.
Reported-by: Nathan Chancellor <nathan@kernel.org>
Link: https://github.com/ClangBuiltLinux/linux/issues/1780
Cc: Weili Qian <qianweili@huawei.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org> # build
Link: https://lore.kernel.org/r/20230106041945.never.831-kees@kernel.org
Diffstat (limited to 'drivers/crypto/hisilicon')
| -rw-r--r-- | drivers/crypto/hisilicon/sgl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c index 2b6f2281cfd6..0974b0041405 100644 --- a/drivers/crypto/hisilicon/sgl.c +++ b/drivers/crypto/hisilicon/sgl.c @@ -124,9 +124,8 @@ err_free_mem: for (j = 0; j < i; j++) { dma_free_coherent(dev, block_size, block[j].sgl, block[j].sgl_dma); - memset(block + j, 0, sizeof(*block)); } - kfree(pool); + kfree_sensitive(pool); return ERR_PTR(-ENOMEM); } EXPORT_SYMBOL_GPL(hisi_acc_create_sgl_pool); |