From nobody Thu Apr 9 21:51:30 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43FAA3D567B for ; Thu, 5 Mar 2026 18:32:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772735561; cv=none; b=KW4Y/ZlisbcNqTn9Z4UBfhRdSJAo7BLXto1gkB+69wvLxFPAZX76UPePAHIMkhN1F8fQcBnUnQj99B+DA7/IY/k8/sJNqIbIbpSDML5CqOpe1+ZDBz89bqGhs5ec/KAN6Jg5X0HTmvXvewRlfstQIzwgtVNmzyYgnXFmE6q1kBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772735561; c=relaxed/simple; bh=57VdQhKyrFy1IExHr+T2rSktoWweVK9HwyXpS1FzsRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mtTA+sEm0PFpAXEAtLH1VoZWH9SY9eD7AKExOGY4+27RXhKPZt7uns9Zfm3MdqMTSHktOnWQoGsNNOLuu2LfLGX9If6VvV9WpzwX3foO4/mx+ZAi7NOEFKX8SsaEAkRiTU2O1WVTpJYnxdsUWXF19NlJG3xM7tUHUPos4/h3OT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bbfK0bah; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bbfK0bah" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82748095892so4225319b3a.0 for ; Thu, 05 Mar 2026 10:32:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772735560; x=1773340360; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4FzuoEEpRY+L14uQlsGmCRGMqZLXTc3G6agjBXy78yU=; b=bbfK0bah7BW8mhwg/MKqZJvTcjI72M1OgMVB/A61MSwn+nBpDxuKsvP3f/BYzNiO9P NRvRLlAQGMYd3Y8CEm20zQUwBWBg2GTKasgK+GgiIkeec3IBxZWz0MrtPE4AH3YXudcx nXAHc6GwObIQgWrXIu6LprxB0JuuHGFFzwVzaP+aZxJmrH0X5jDxD/jHXDD8A6c+RZTl UgiHnpB96Uef6Tjj/I+ZH0HwOFwmGIQpwPT8iZstKWTraby1FsoezcKyFkGn86E8mASe qRCdHDlSgmSRNOsMUwOxZLjAZnbuTFhsltHW5iQ+Se2tn2996llRmsqXArnanfQpd3at PiMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772735560; x=1773340360; 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; bh=4FzuoEEpRY+L14uQlsGmCRGMqZLXTc3G6agjBXy78yU=; b=frFoOx7iiTNnulnyR7NA51FygP5k4I+uXA68IHznmjj2QYrp0kIbmvREwSc8/d4dvz MwR9DJytuxfLBKK/9E9XuPMzT0dvzEYRLCgHTJQEtmqSraJOdGXNPPfJ/3y9ONDSb/+I gMOO9jMLymCW6FibubPgZUAtcOeSkY+sCNZ2ryAXpGAeSCQWRGwVy+yvQuUyyhzN4CFK u1UWgnhCvE4smN/ePnbC+u2+0Wd7I2Lb83JYAvMlTAYiVVXA5jBSaae/FRBJ8fqGYrj2 Cx14KcMClEdLsMw+APlv8GdiG3f9ZQso1oAYlBOmZWhTWx/2CxsEsZAoq3IXOFJbPpIZ HyuQ== X-Forwarded-Encrypted: i=1; AJvYcCU3I4ZRnV0rB3O0iKH3VOWpZ4h/54v2JKpe5RWef6Ni/X3DTMDzqZnpVlVAf+cuqYzEAMXjYQSStLi1n9I=@vger.kernel.org X-Gm-Message-State: AOJu0YwkevC04UjbBX6jrTD3djIAs3+Y55PKZ6SUyLS9wknpYi6Q2uNO vB9D7NN+L4sXewlb5EvrR1CaVW16wDG4rsE3Q8QyqXsdLfmi5/kFflC2 X-Gm-Gg: ATEYQzzWASCJI+Uz/Tq2c0Kmw/eV5mzInNKev2EkwFS+JE2nN6R1lEXsF5zKqQORZW/ xFxrqkraSLvxtGz3tokhGCt6MNx1kLBS7gGfPjTA4KuK2OA2ytX1wphza/uuTy1r4ZcNBiMap/8 wNi40qpehQ1vXnZ3mMmKggq/xELUPdp6sPxNuI37U0eEIr5Ml3LjwgdbPFZSePVBf2eWWBLggVp IWIkw9ODembkp5/pU7OpSPD6CxfS5havDWN8q9z0AxVdUlcKz2rjqfMVmcR6HegLyEe1QypwbFv 2a0/YZqD0OpEGeqCGwjlDIfjtDnE/mbPGYVxMsN9KdmpZYphdSKDRX+8Mm895VsKEl8SJZvLAHl A8577PLolwng8xumga7GryjWkuT3AD+Ds/ZJN99sLHTDyyr9njIj7T6eB02ILltYDXFZzVtb8d+ 03CCZyjU2jEaFGbpqJVZq2MRngE6trcw== X-Received: by 2002:a05:6a00:2482:b0:829:7245:92f7 with SMTP id d2e1a72fcca58-8299aa203e0mr484415b3a.3.1772735559482; Thu, 05 Mar 2026 10:32:39 -0800 (PST) Received: from arm-server.. ([2001:288:7001:2724:1a31:bfff:fe58:b622]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829898e1417sm2554420b3a.62.2026.03.05.10.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 10:32:39 -0800 (PST) From: Cheng-Yang Chou To: herbert@gondor.apana.org.au, davem@davemloft.net, catalin.marinas@arm.com, will@kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: jserv@ccns.ncku.edu.tw, yphbchou0911@gmail.com Subject: [PATCH 1/1] crypto: arm64/aes-neonbs - Move key expansion off the stack Date: Fri, 6 Mar 2026 02:32:24 +0800 Message-ID: <20260305183229.150599-2-yphbchou0911@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260305183229.150599-1-yphbchou0911@gmail.com> References: <20260305183229.150599-1-yphbchou0911@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" aesbs_setkey() and aesbs_cbc_ctr_setkey() trigger -Wframe-larger-than=3D warnings due to struct crypto_aes_ctx being allocated on the stack, causing the frame size to exceed 1024 bytes. Allocate struct crypto_aes_ctx on the heap instead to reduce stack usage. Use a goto-based cleanup path to ensure memzero_explicit() and kfree() are always called. Signed-off-by: Cheng-Yang Chou --- arch/arm64/crypto/aes-neonbs-glue.c | 39 ++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-ne= onbs-glue.c index cb87c8fc66b3..a24b66fd5cad 100644 --- a/arch/arm64/crypto/aes-neonbs-glue.c +++ b/arch/arm64/crypto/aes-neonbs-glue.c @@ -76,19 +76,25 @@ static int aesbs_setkey(struct crypto_skcipher *tfm, co= nst u8 *in_key, unsigned int key_len) { struct aesbs_ctx *ctx =3D crypto_skcipher_ctx(tfm); - struct crypto_aes_ctx rk; + struct crypto_aes_ctx *rk; int err; =20 - err =3D aes_expandkey(&rk, in_key, key_len); + rk =3D kmalloc(sizeof(*rk), GFP_KERNEL); + if (!rk) + return -ENOMEM; + + err =3D aes_expandkey(rk, in_key, key_len); if (err) - return err; + goto out; =20 ctx->rounds =3D 6 + key_len / 4; =20 scoped_ksimd() - aesbs_convert_key(ctx->rk, rk.key_enc, ctx->rounds); - - return 0; + aesbs_convert_key(ctx->rk, rk->key_enc, ctx->rounds); +out: + memzero_explicit(rk, sizeof(*rk)); + kfree(rk); + return err; } =20 static int __ecb_crypt(struct skcipher_request *req, @@ -133,22 +139,27 @@ static int aesbs_cbc_ctr_setkey(struct crypto_skciphe= r *tfm, const u8 *in_key, unsigned int key_len) { struct aesbs_cbc_ctr_ctx *ctx =3D crypto_skcipher_ctx(tfm); - struct crypto_aes_ctx rk; + struct crypto_aes_ctx *rk; int err; =20 - err =3D aes_expandkey(&rk, in_key, key_len); + rk =3D kmalloc(sizeof(*rk), GFP_KERNEL); + if (!rk) + return -ENOMEM; + + err =3D aes_expandkey(rk, in_key, key_len); if (err) - return err; + goto out; =20 ctx->key.rounds =3D 6 + key_len / 4; =20 - memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc)); + memcpy(ctx->enc, rk->key_enc, sizeof(ctx->enc)); =20 scoped_ksimd() - aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds); - memzero_explicit(&rk, sizeof(rk)); - - return 0; + aesbs_convert_key(ctx->key.rk, rk->key_enc, ctx->key.rounds); +out: + memzero_explicit(rk, sizeof(*rk)); + kfree(rk); + return err; } =20 static int cbc_encrypt(struct skcipher_request *req) --=20 2.48.1