Received-SPF: pass (google.com: domain of linux-kernel+bounces-213048-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Jia Jie Ho <jiajie.ho@starfivetech.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S . Miller" <davem@davemloft.net>,
	linux-crypto@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2] crypto: starfive - Align rsa input data to 32-bit
Date: Thu, 13 Jun 2024 16:39:42 +0800
Message-ID: <20240613083942.760182-1-jiajie.ho@starfivetech.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
 =?us-ascii?Q?DxzsMKNIYoR5q26BAaJXKXjQq5P/sVVomjSTEmWXDJJ3dnl1QrO1UuSQns9S?=
 =?us-ascii?Q?ltjGJ2kYLwROzrEPU44SXVxboCl81Qy3qR7YBfmLQCNYL3XPsNvT7hTq1kXY?=
 =?us-ascii?Q?Q5PIq+MQ7NU32P1k7EDBzvz2WekLnN/pnNLH/aCU7PnCbJECMA/kgWa0EsXW?=
 =?us-ascii?Q?I3zWSkIbLPxOvKEIi+4iFtrhhNV0bElLxKHQYXxRFDbDHdIEK5irSiapBrta?=
 =?us-ascii?Q?sRsh28YpVtczors7mov0PQATJR3ivqcgzBF5MR1TaNeNDpd7Hp7UpI/E+3Ae?=
 =?us-ascii?Q?ucP/TYKReFuu6jWxwaeMg6L/fk1NyNxsbLm7WI220zW3OUG7dU4Jd1ujJnMJ?=
 =?us-ascii?Q?HlY8jpnSyBHabbWRAcwpzBXP5g/gRIwoi9eL8i74qG0K6JulAPiUlpp4QfLD?=
 =?us-ascii?Q?B9pgleqS7Enq7aGY81wuF+2kXSQ+21fO2wi+EZXvFghplcMWcZWnWRP/Yuzm?=
 =?us-ascii?Q?orul7Ok5J1tIDQLg1AvjViC5oKWCifCZTQjcSXK234YOK2cn0M80vWy8QKxk?=
 =?us-ascii?Q?riqDUgaCiAWEE717My4SCULcrLskEHIZ3rJFLzNoauSiB8Jy6QCGVQkF5Qnj?=
 =?us-ascii?Q?sra3o6Wmdd1DqIIgKq8rKzMFyDXtPuSZLHULNbE+jNRUBhmMssHtQGrHcl2j?=
 =?us-ascii?Q?vH1JKn1x9iNkY3xH2JMMUTnbn82RnRdCrsI2iLEzu0WzaXqceYwz79yANgND?=
 =?us-ascii?Q?k6c1b5CYTfbnXiukou/MSRYibHhynW9V3Pf7iXbPOJd/In4kTqF7i3qG4sUO?=
 =?us-ascii?Q?OlePtpF8+bdvAuObuKTMNKbh8hOngdnWGHmzEPX+U8kewpvsrT/K3LH+plun?=
 =?us-ascii?Q?b8IVUX6zW76798YnZNFBONLBK46esI0grZ+lgma2BOyqZXlMLkasIeU4qYKZ?=
 =?us-ascii?Q?MM13W+AgHroNRyOb3Nj/2vjh+Nh9eFa6weTuyMH6JZd5kGcGh1oV3dD+l5qj?=
 =?us-ascii?Q?FxZTDzazMsgnMLt7bABHf0c3D6eTPLhaEA607GFarw+74wkD5x7FwuW+vzUe?=
 =?us-ascii?Q?SN6zQQG7yGsB6/eOi9NOlcWB/QyGhcD+YgvUxhW/sTUvDGMm44LS14n9oV1G?=
 =?us-ascii?Q?O3VQN09m9K23lHeqaAjp5Gb19kN7uqbU2I9p5jlRnvpbvyPYyIPX+1NtL5nF?=
 =?us-ascii?Q?LVYW4J3ECMQp0eFZc1UaPT7UNA8yJsTJkrNcl6UINuN84vpq7MauJM3UeZdF?=
 =?us-ascii?Q?wFW54SrUHlrMqpJO/2WFGoWaX2WU8985p690goVuW+YdjtY9DbM7fNFWQU2m?=
 =?us-ascii?Q?cmqzC9CgOjiNuA/wBVD7kVINIXyaE7MeH1MVZKABTi3txFEmFLckVYW5Zuyn?=
 =?us-ascii?Q?nsAu43YqE8IHBDGFk0f9tqh+02ZtNzHoBOvko/59m6UbeeQ4pCGXl1eP4/ZR?=
 =?us-ascii?Q?JhL8z7kGGLPZYL/ditopuIRJC+TjReGaK8GY/y9/rLOtW5F9LgPYA4tVutWN?=
 =?us-ascii?Q?bRXZpBbAgKQTBisndZRbZI4Tun7TRJCPZi5Vxmc7s7p380vqye9XORTs8xNJ?=
 =?us-ascii?Q?D2g9tkgeKqAi1TdYNmWH/esbg/NiX1fpBtcmG1edE3Oh2+Sm8rU4gqWraGhn?=
 =?us-ascii?Q?l2GlFU/4W04PqDOnHpivafdwPZ80UGuP0fa9KfvAAaIigHRSm7ygIKOMUAdh?=
 =?us-ascii?Q?fA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e9bbd63-d1c3-444c-25bc-08dc8b846404
X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1182.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2024 08:39:51.1510
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kfCvbasEaIpSTGGDudvVXXP/He26JDUjxK+sqeQ6KP/zrhU7gYWVr3HtWolQPcQXPK61sDrrzKb2Nmv9XfV2Ps61GJLLeZobhBnKMq6+aR0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1263
X-OriginatorOrg: starfivetech.com

Hardware expects RSA input plain/ciphertext to be 32-bit aligned.
Set fixed length for preallocated buffer to the maximum supported
keysize of the hardware and shift input text accordingly.

v1->v2: Build the extra space required for shifting into reqsize.

Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>
---
 drivers/crypto/starfive/jh7110-cryp.h |  4 ++--
 drivers/crypto/starfive/jh7110-rsa.c  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/starfive/jh7110-cryp.h b/drivers/crypto/starfive/jh7110-cryp.h
index 494a74f52706..ad0bc8878522 100644
--- a/drivers/crypto/starfive/jh7110-cryp.h
+++ b/drivers/crypto/starfive/jh7110-cryp.h
@@ -30,6 +30,7 @@
 #define MAX_KEY_SIZE				SHA512_BLOCK_SIZE
 #define STARFIVE_AES_IV_LEN			AES_BLOCK_SIZE
 #define STARFIVE_AES_CTR_LEN			AES_BLOCK_SIZE
+#define STARFIVE_RSA_MAX_KEYSZ			256
 
 union starfive_aes_csr {
 	u32 v;
@@ -217,12 +218,11 @@ struct starfive_cryp_request_ctx {
 	struct scatterlist			*out_sg;
 	struct ahash_request			ahash_fbk_req;
 	size_t					total;
-	size_t					nents;
 	unsigned int				blksize;
 	unsigned int				digsize;
 	unsigned long				in_sg_len;
 	unsigned char				*adata;
-	u8 rsa_data[] __aligned(sizeof(u32));
+	u8 rsa_data[STARFIVE_RSA_MAX_KEYSZ];
 };
 
 struct starfive_cryp_dev *starfive_cryp_find_dev(struct starfive_cryp_ctx *ctx);
diff --git a/drivers/crypto/starfive/jh7110-rsa.c b/drivers/crypto/starfive/jh7110-rsa.c
index 33093ba4b13a..f8a1bc5dcf0f 100644
--- a/drivers/crypto/starfive/jh7110-rsa.c
+++ b/drivers/crypto/starfive/jh7110-rsa.c
@@ -31,7 +31,6 @@
 /* A * A * R mod N ==> A */
 #define CRYPTO_CMD_AARN			0x7
 
-#define STARFIVE_RSA_MAX_KEYSZ		256
 #define STARFIVE_RSA_RESET		0x2
 
 static inline int starfive_pka_wait_done(struct starfive_cryp_ctx *ctx)
@@ -74,14 +73,13 @@ static int starfive_rsa_montgomery_form(struct starfive_cryp_ctx *ctx,
 {
 	struct starfive_cryp_dev *cryp = ctx->cryp;
 	struct starfive_cryp_request_ctx *rctx = ctx->rctx;
-	int count = rctx->total / sizeof(u32) - 1;
+	int count = (ALIGN(rctx->total, sizeof(u32)) >> 2) - 1;
 	int loop;
 	u32 temp;
 	u8 opsize;
 
 	opsize = (bit_len - 1) >> 5;
 	rctx->csr.pka.v = 0;
-
 	writel(rctx->csr.pka.v, cryp->base + STARFIVE_PKA_CACR_OFFSET);
 
 	for (loop = 0; loop <= opsize; loop++)
@@ -117,7 +115,6 @@ static int starfive_rsa_montgomery_form(struct starfive_cryp_ctx *ctx,
 		rctx->csr.pka.cmd = CRYPTO_CMD_AERN;
 		rctx->csr.pka.start = 1;
 		rctx->csr.pka.ie = 1;
-
 		writel(rctx->csr.pka.v, cryp->base + STARFIVE_PKA_CACR_OFFSET);
 
 		if (starfive_pka_wait_done(ctx))
@@ -251,12 +248,17 @@ static int starfive_rsa_enc_core(struct starfive_cryp_ctx *ctx, int enc)
 	struct starfive_cryp_dev *cryp = ctx->cryp;
 	struct starfive_cryp_request_ctx *rctx = ctx->rctx;
 	struct starfive_rsa_key *key = &ctx->rsa_key;
-	int ret = 0;
+	int ret = 0, shift = 0;
 
 	writel(STARFIVE_RSA_RESET, cryp->base + STARFIVE_PKA_CACR_OFFSET);
 
-	rctx->total = sg_copy_to_buffer(rctx->in_sg, rctx->nents,
-					rctx->rsa_data, rctx->total);
+	if (!IS_ALIGNED(rctx->total, sizeof(u32))) {
+		shift = sizeof(u32) - (rctx->total & 0x3);
+		memset(rctx->rsa_data, 0, shift);
+	}
+
+	rctx->total = sg_copy_to_buffer(rctx->in_sg, sg_nents(rctx->in_sg),
+					rctx->rsa_data + shift, rctx->total);
 
 	if (enc) {
 		key->bitlen = key->e_bitlen;
@@ -305,7 +307,6 @@ static int starfive_rsa_enc(struct akcipher_request *req)
 	rctx->in_sg = req->src;
 	rctx->out_sg = req->dst;
 	rctx->total = req->src_len;
-	rctx->nents = sg_nents(rctx->in_sg);
 	ctx->rctx = rctx;
 
 	return starfive_rsa_enc_core(ctx, 1);
-- 
2.43.0