From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.125.188.122 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795178272; b=f+z84YFQxqHJOafYoQxh6kLxfD9cUE+Pj9OnkTRgnaz1pgjb74JWlSYubiu1qPbSfVo5 0Qk1WXKU9BKLoiI4yxTzNjowrwGnQSgz2pjqcPe4Z8IrTYclR49VBzL4lsI/o8aI4rNiZ tZk5PtWgya+jxzEVxRSSB8nvOSASUKhayx5Tks1WHCtL42pk+8GGO5A/DnRUO7LOZD7rH CdLQkC0waEgIS/rFVXyP8Qdh67jM9J5TGR8pY8m0gLfyzNDVrLhBUB2A9DseHieGJhu8h c+qemzehERc3jZutcgWGPqtnYrp8zg8u1AhuZqXH6wcGk/QNy90mc+HE4JT6q4ApZpw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795178272; h=DMARC-Filter:Received:DKIM-Signature:Received: X-Google-DKIM-Signature:X-Forwarded-Encrypted:X-Gm-Message-State: X-Gm-Gg:X-Received:X-Received:Received:From:To:Cc:Subject:Date: Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=i9H1Qf5VeBDEAJ+KENGPjuJrwt4TmksckkFthv/+CKg=; b=mso46U5MGQu2x+PFfGIDE79k4PaVca8pILk54CLvW8ircmhuy7SI8azJC48+SgNF3ZgZ FtIP17lZV9w+CNSWs5bDdGQZC9l089kF4ygihGkAp1Gnxj72+HIvNU+5JupT2zyBhHdPY 9ImEpi6QZAVqBDEGFQWzxP6vlZ8Iyzs718DBIQs8yFJUQel+2eiRiUUMbhtOoS7xXmfP4 lkNi+myHMsa0WTAnP/b3QZhc26VcwQHfl2x//0dtVMXcgWsKNImZh/+wte8KcnT/jnyoZ fffEroZBNOyYnoD7LKF6cmLvasuazEETILftdEiTQAS5ZckyC+VSxz7w5OcqvnP4wAg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20251003 header.b="mz/XdwZ1"; arc=none smtp.remote-ip=185.125.188.122 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95B62606A325 for ; Fri, 20 Nov 2026 12:37:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 95B62606A325 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20251003 header.b=mz/XdwZ1 Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 47D8F3FE2D for ; Fri, 20 Nov 2026 12:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1795178270; bh=i9H1Qf5VeBDEAJ+KENGPjuJrwt4TmksckkFthv/+CKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mz/XdwZ1rC7uARepzQ2g+LPWLKZStFbDS4ZueAhwH1ZXAZbhU24T/56g6k5Zz2g1/ JBy54xpce1M40Abt4Oh5i2zs7IwI0QJRPCbab92Zeehi456uPbhhhlhUVXpNtXUReU BZJA7FNAP4nJR57ZdrtE4eJpQ2/oxYZ3pZVuyRD5MA9LjKZnHCvF1BRzw8FcV55hlu 0OnNvbL6925W90t9EUXg27vdoEABG3ntRa4y+pzEBxKJX9JTtiTOYS+0YLGErJHXMq DxHJledVg1LTFvqB+I54RajtKFZdhKbL76gn0F9L/OJwDorw2KriDysYMHqPhwJahk WiKvUIKONSrA3jX4CoplPGRFPql3joL/g3JRk/BmKsHk7UvPrziWwgjUvxtoVIpAmS DjYeyXEHQGr0hY8+UE/1D1sS3PDcNNcnBf97JE7A2fbKsgPjxaDWOFnF8DocrUUbxV Hco+696pp4KIeXxaT31RUvuaGPIMkQGkenHrL4gahzCJG/smtYkma7AmbJqmij77JR wFoe6/GPp/XzMkVmP90RLWlsFhw+YjohVCFJYFQ5gkqrDESNZ/mGjgaWTZp9O9cTsy hk2iAvkHyyuB4/E5ReRBsl4dDv8Cepn0N8UbHmbqc4/HUEGm7Bs+KiYhr3CvoVDoJA 1kwLu3hlOWDyD3QYS0bOGuqg= Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-30bcb065bfdso896172eec.0 for ; Fri, 20 Nov 2026 04:37:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795178269; x=1795783069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=i9H1Qf5VeBDEAJ+KENGPjuJrwt4TmksckkFthv/+CKg=; b=XnKAOcyM+yypb1z78VOD7stEeVJ0AKnCk+GyeBJWVdm+OblRb840YQpgtbb0eAvA5X 9ZOEq3WZG+GAQzNchhxxhr0+cNdJ7EvqSyzh3rCNekSDf8PnquJIx1w52ffAlcrAVkV4 QAuwNRqUNS6NN+jHpFhz5ailZDtShDXC5S+4zClXAC+ofO8BJbbJB6xwfsYLKy91N63o lJHZnDCOAg0f0ApLW6OmQ6c2nfVFnpj6aIkTDEZdJ+ifCr3oxgGI7pDOs7TCYgJFev3F qPs82LJljJ1l7VUlHPz8t6W5ROnBFrBDC74IWt5ESKtAyp9F2q3qK5Xt0jBkWaJZfKgN f2Ig== X-Forwarded-Encrypted: i=1; AL+hErETwk2YJ+GJ8LG4pWlB7RLsCHo7eE0Jkshuq1zTBe5puBX4vPqpID7xQEWRasSrWwsQCpb4PY9Ti7D+nh0=@vger.kernel.org X-Gm-Message-State: APuU4Z9MgHNHfv2hMGD1ddureFbbDsrzQdnMh7aMDN8eGuICnhX50CZG aV84kjEicAilfpLlqy78fV2P3/1GEAkBKZ4AatwBckBr6ISxD0yy/VdywkMQWlzOp2rkcqVnyBz uFqvAD2tb9d5heRRPYYPXQlwBfIHs7px4uNZO8vZGmIxdPV/BFdcn/lWjPbLFEQ5kxKEjFhtUZg OyfoUegA== X-Gm-Gg: AZFdTZe1tG22/5tSQhVDbBqB4QGgH91H9tU/3fW5JeWAa4Tbghooy07jTnI/vC/vcsB mV+U8noWof+KaHJNELSTt2LO1J7E4HoMQ3bfrZEc/uqW4sL40EcbWxe03l9K6kdzi6v4ddZkQ9P yG6eSImJln81FGNxb1JMxA8VUXod0KaaFeGJQK2APmmMjLAPvWJPZ8kCwBBipIJeJeiIQ3WshXQ 0juTW1zn/XNTbuGzDKmX0v0bkTX7/wkFtds9ALojcw1BWDwTQ+CIQtyGwI6yTYuAV30w1oPCkQb ZVjDcJ5JoG24LH3txlLYUZq1a7+f71cmYQqseSEkyK9hj/jLv94iCtEKW6uNCYXuWPi2KV1wFZc uUYZWAu8pOVkjqxXSQ/pfXfnzYFdtD8dFuBN9GuMWGIHN3pzcbG4G5PeEzdQ= X-Received: by 2002:a05:7301:6183:20b0:384:b2cb:5f76 with SMTP id 5a478bee46e88-3856fe5ebddmr2577979eec.23.1795178268522; Fri, 20 Nov 2026 04:37:48 -0800 (PST) X-Received: by 2002:a05:7301:6183:20b0:384:b2cb:5f76 with SMTP id 5a478bee46e88-3856fe5ebddmr2577952eec.23.1795178268073; Fri, 20 Nov 2026 04:37:48 -0800 (PST) Received: from ZBook.gateway ([123.208.39.53]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-385677c371esm7994093eec.23.2026.11.20.04.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2026 04:37:47 -0800 (PST) From: Changwei Zou To: herbert@gondor.apana.org.au, sahil.malhotra@nxp.com Cc: davem@davemloft.net, horia.geanta@nxp.com, pankaj.gupta@nxp.com, gaurav.jain@nxp.com, jeffbarnes@linux.microsoft.com, stephane.debusne@cynove.com, iuliana.prodan@nxp.com, martin.kepplinger-novakovic@ginzinger.com, lukas@wunner.de, sahil.malhotra@oss.nxp.com, changwei.zou@canonical.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 1/2] crypto: caam - Fix wrong unmap operations Date: Fri, 20 Nov 2026 23:37:31 +1100 Message-ID: <20261120123732.1200685-2-changwei.zou@canonical.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261120123732.1200685-1-changwei.zou@canonical.com> References: <20261120123732.1200685-1-changwei.zou@canonical.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Since priv_form only takes values FORM1/FORM2/FORM3 with no distinct public key enumerator, rsa_pub_unmap() was not called correctly in akcipher_do_one_req() and akcipher_enqueue_req(). Use the completion callback (rsa_pub_done vs rsa_priv_f_done) to distinguish public from private key operations, then dispatch to the correct unmap function based on key->priv_form. Factor the priv_form switch into rsa_priv_unmap() and the public/private dispatch into rsa_pdb_unmap(), so rsa_priv_f_done() and both error paths share one implementation. caam_rsa_set_priv_key_form() implicitly relies on zero-initialization for priv_form. Set priv_form = FORM1 explicitly at the head of the function for clarity and robustness. Fixes: bf53795025a2 ("crypto: caam - add crypto_engine support for RSA algorithms") Signed-off-by: Changwei Zou Reviewed-by: Sahil Malhotra --- drivers/crypto/caam/caampkc.c | 66 +++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c index 2082adaae585..4b5397f2ca64 100644 --- a/drivers/crypto/caam/caampkc.c +++ b/drivers/crypto/caam/caampkc.c @@ -119,6 +119,23 @@ static void rsa_priv_f3_unmap(struct device *dev, struct rsa_edesc *edesc, dma_unmap_single(dev, pdb->tmp2_dma, q_sz, DMA_BIDIRECTIONAL); } +static inline void rsa_priv_unmap(struct device *dev, struct rsa_edesc *edesc, + struct akcipher_request *req, + struct caam_rsa_key *key) +{ + switch (key->priv_form) { + case FORM1: + rsa_priv_f1_unmap(dev, edesc, req); + break; + case FORM2: + rsa_priv_f2_unmap(dev, edesc, req); + break; + case FORM3: + rsa_priv_f3_unmap(dev, edesc, req); + break; + } +} + /* RSA Job Completion handler */ static void rsa_pub_done(struct device *dev, u32 *desc, u32 err, void *context) { @@ -168,16 +185,7 @@ static void rsa_priv_f_done(struct device *dev, u32 *desc, u32 err, edesc = req_ctx->edesc; has_bklog = edesc->bklog; - switch (key->priv_form) { - case FORM1: - rsa_priv_f1_unmap(dev, edesc, req); - break; - case FORM2: - rsa_priv_f2_unmap(dev, edesc, req); - break; - case FORM3: - rsa_priv_f3_unmap(dev, edesc, req); - } + rsa_priv_unmap(dev, edesc, req, key); rsa_io_unmap(dev, edesc, req); kfree(edesc); @@ -192,6 +200,22 @@ static void rsa_priv_f_done(struct device *dev, u32 *desc, u32 err, crypto_finalize_akcipher_request(jrp->engine, req, ecode); } +static void rsa_pdb_unmap(struct device *jrdev, struct rsa_edesc *edesc, + struct akcipher_request *req, + void (*cbk)(struct device *jrdev, u32 *desc, + u32 err, void *context)) +{ + if (cbk == rsa_pub_done) { + rsa_pub_unmap(jrdev, edesc, req); + } else { + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); + struct caam_rsa_ctx *ctx = akcipher_tfm_ctx_dma(tfm); + struct caam_rsa_key *key = &ctx->key; + + rsa_priv_unmap(jrdev, edesc, req, key); + } +} + /** * caam_rsa_count_leading_zeros - Count leading zeros, need it to strip, * from a given scatterlist @@ -391,7 +415,8 @@ static int akcipher_do_one_req(struct crypto_engine *engine, void *areq) return ret; if (ret != -EINPROGRESS) { - rsa_pub_unmap(jrdev, req_ctx->edesc, req); + rsa_pdb_unmap(jrdev, req_ctx->edesc, req, + req_ctx->akcipher_op_done); rsa_io_unmap(jrdev, req_ctx->edesc, req); kfree(req_ctx->edesc); } else { @@ -670,9 +695,6 @@ static int akcipher_enqueue_req(struct device *jrdev, struct akcipher_request *req) { struct caam_drv_private_jr *jrpriv = dev_get_drvdata(jrdev); - struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); - struct caam_rsa_ctx *ctx = akcipher_tfm_ctx_dma(tfm); - struct caam_rsa_key *key = &ctx->key; struct caam_rsa_req_ctx *req_ctx = akcipher_request_ctx(req); struct rsa_edesc *edesc = req_ctx->edesc; u32 *desc = edesc->hw_desc; @@ -691,19 +713,7 @@ static int akcipher_enqueue_req(struct device *jrdev, ret = caam_jr_enqueue(jrdev, desc, cbk, req); if ((ret != -EINPROGRESS) && (ret != -EBUSY)) { - switch (key->priv_form) { - case FORM1: - rsa_priv_f1_unmap(jrdev, edesc, req); - break; - case FORM2: - rsa_priv_f2_unmap(jrdev, edesc, req); - break; - case FORM3: - rsa_priv_f3_unmap(jrdev, edesc, req); - break; - default: - rsa_pub_unmap(jrdev, edesc, req); - } + rsa_pdb_unmap(jrdev, edesc, req, cbk); rsa_io_unmap(jrdev, edesc, req); kfree(edesc); } @@ -993,6 +1003,8 @@ static int caam_rsa_set_priv_key_form(struct caam_rsa_ctx *ctx, unsigned aligned_size; int ret; + rsa_key->priv_form = FORM1; + rsa_key->p = caam_read_raw_data(raw_key->p, &p_sz); if (!rsa_key->p) return -ENOMEM; -- 2.43.0