Skip to contentSkip to conversation

dm crypt: fix invalid copy paste in crypt_alloc_req_aead

PATCH New Ignat Korchagin 1 participant 1 message Jan 19, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm crypt: fix invalid copy paste in crypt_alloc_req_aead

In commit d68b295 ("dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq") I wrongly copy pasted crypto request allocation code from crypt_alloc_req_skcipher to crypt_alloc_req_aead. It is OK from runtime perspective as both simple encryption request pointer and AEAD request pointer are part of a union, but may confuse code reviewers.

Fixes d68b295 ("dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq")
---
 drivers/md/dm-crypt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/md/dm-crypt.c +3 -3
index 8c874710f0bc..5a55617a08e6 100644
@@ -1481,9 +1481,9 @@ static int crypt_alloc_req_skcipher(struct crypt_config *cc,
 static int crypt_alloc_req_aead(struct crypt_config *cc,
 				 struct convert_context *ctx)
 {
-	if (!ctx->r.req) {
-		ctx->r.req = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO);
-		if (!ctx->r.req)
+	if (!ctx->r.req_aead) {
+		ctx->r.req_aead = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO);
+		if (!ctx->r.req_aead)
 			return -ENOMEM;
 	}
 
Signature · 6 lines
2.20.1

--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel