linux-kernel - [PATCH] blk-crypto: Add check for mempool

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250102083319.176310-1-haoxiang_li2024@163.com>
Date: Thu,  2 Jan 2025 16:33:19 +0800
From: Haoxiang Li <haoxiang_li2024@....com>
To: axboe@...nel.dk,
	satyat@...gle.com,
	ebiggers@...gle.com
Cc: linux-block@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Haoxiang Li <haoxiang_li2024@....com>,
	stable@...r.kernel.org
Subject: [PATCH] blk-crypto: Add check for mempool_alloc()

Add check for the return value of mempool_alloc() to
catch the potential exception and avoid null pointer
dereference.

Fixes: 488f6682c832 ("block: blk-crypto-fallback for Inline Encryption")
Cc: stable@...r.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@....com>
---
 block/blk-crypto-fallback.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c
index 29a205482617..47acd7a48767 100644
--- a/block/blk-crypto-fallback.c
+++ b/block/blk-crypto-fallback.c
@@ -514,6 +514,12 @@ bool blk_crypto_fallback_bio_prep(struct bio **bio_ptr)
 	 * bi_end_io appropriately to trigger decryption when the bio is ended.
 	 */
 	f_ctx = mempool_alloc(bio_fallback_crypt_ctx_pool, GFP_NOIO);
+
+	if (!f_ctx) {
+		bio->bi_status = BLK_STS_RESOURCE;
+		return false;
+	}
+
 	f_ctx->crypt_ctx = *bc;
 	f_ctx->crypt_iter = bio->bi_iter;
 	f_ctx->bi_private_orig = bio->bi_private;
-- 
2.25.1