From patchwork Fri May 2 09:03:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 887264 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E80EB2581 for ; Fri, 2 May 2025 09:04:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176644; cv=none; b=Jhoh6EpsctWdXZcVXjgn9l0+uXHRwVnQi8feI9YFPO6QV8bTdlTbqleuvcrLpedubE/yz68V3CYwQNa49Kxb9Vlj2k02mlMYjTER5WZiVoBC30BZqRmSOJ/VFLs6WQx387G4wPIK+H53pTm2nfXnftRQAL44UrGTSxsRSxuFYsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176644; c=relaxed/simple; bh=5xJxjatv1SXBgZWuHf/pcOnNZHixmTq2mur34YZVQWI=; h=Date:Message-Id:From:Subject:To; b=Ybhs0AN7RMZsjblKbZXnjoCH8O4n7IliVoElb5lfCk4PndjCJGq386+bJYTyxVNQcR1ZnqBWIUgU/IGpT5Q/jSw3YM3fsoJ7u4cWUGGhmt9Z405NfN6HkwQp3DsVLQxY7zhICSiDIkLIDLxQOMMlRn7D4mCrcYO5L+99+QAN0Ag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b=lC7y52qU; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b="lC7y52qU" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=To:Subject:From:Message-Id:Date:Sender:Reply-To:Cc:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3gLiLWifk3nVPNK6MTy0c8gc/xHYCFmOA4uzNtcPE34=; b=lC7y52qU3VA/WPoJrTL8kq6BC6 VohW+avW6iSEEDcA/thF9x9lO3ycgPpWMNftFIy0IhMMeQ8lKSBvZiTTD2A4Qafcz1DTuntfyw0c1 Mvk8gg28o4lbnDV1Z5Q0eiDVwfQfh5kQhK9+nAKDlC2FLY0NTTwhmp7aeR7TrsTvDhsGU/pKy6iJH Jnf3uNS+EtMgnWIGtBoPT/8Nn24vG0aeYKMPtUvQ7+o5LH+D/i80Bm2v3YZ2aWC1BemRRxciNEF6A iRajS8tyZF46MCVov9uO5vedtGc+yw6YF42uHmSd766uOZF3IqmVEHQZeHz8YoK7zjSWYdEwb88nb TgQOJKdw==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1uAmJI-002nrz-2m; Fri, 02 May 2025 17:03:57 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 02 May 2025 17:03:56 +0800 Date: Fri, 02 May 2025 17:03:56 +0800 Message-Id: <41f8d44fe2b46ac2e1f0c54e550aa8bffe9e1cf3.1746176535.git.herbert@gondor.apana.org.au> From: Herbert Xu Subject: [PATCH 1/3] crypto: shash - Cap state size to HASH_MAX_DESCSIZE To: Linux Crypto Mailing List Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Now that all shash algorithms have converted over to the generic export format, limit the shash state size to HASH_MAX_DESCSIZE. Signed-off-by: Herbert Xu --- crypto/shash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/shash.c b/crypto/shash.c index c4a724e55d7a..4f446463340e 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -479,6 +479,8 @@ static int shash_prepare_alg(struct shash_alg *alg) if (alg->descsize > HASH_MAX_DESCSIZE) return -EINVAL; + if (alg->statesize > HASH_MAX_DESCSIZE) + return -EINVAL; return 0; } From patchwork Fri May 2 09:03:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 886710 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30F752AF0E for ; Fri, 2 May 2025 09:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176645; cv=none; b=VzGRbdhyJF90jaMrGbCjGS9yLuspkUJLRr6tXRZ+wKA74X3uF6+JSjcyNqfq7y8MbKI0K3dWts9PhhtvvljH4uo6zUaLrj4L8RS9bIJTo8BfPswOkPI8SkOagbv/pzi+FGTNrqjMQHiWfhKY8RC3mHyuxs7tID+pAWmUBH6XO8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176645; c=relaxed/simple; bh=ODO6ZM0/jidY6rye1tNgcaqtkmpS0cCKNDugLw6dSI0=; h=Date:Message-Id:In-Reply-To:References:From:Subject:To; b=sCmB8LDZ0fce8HdHUrav3h+qDW0sJM/ORfFGqXFYdDS/FQnA8u2XwEfLJbNCUOYM2i/mGvkvQDK9kKFOh+h8TkxA0k932DC2Fe/ZuY15SNa6OkUmJQw05nEBoVVJeUwI1vmkYdTuDPKAHKnLYYS1EGOhb13NLDsKbBKlbH1X/e8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b=HgcDOUwH; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b="HgcDOUwH" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=To:Subject:From:References:In-Reply-To:Message-Id:Date:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=mw4AWBcJUevQs8Dg5ceK4NY4Phh54ID4GE52xb9j6tU=; b=HgcDOUwHbqtAx5G0U9UsFgGiLi psDdgQb34KWfsJpbQMVADRVv/bSVOFXIsBm9eUNDBpwoChfbts7QuRUIjZ0nqZs617uJ5By8B/Jx/ wbHy9Ka5qRVUm0RP1qaLKvzUZ78kU4LTdXfpuQFhV0S6lapRIc6QW6YptRUeWhCK3/XWXBRkMAuLz laT+7SuTg+7qKYtE6t104denmLcFHVJgtJuSdSCvbZjKhK4DaZvp8RpiwaAPXx4JbqeAFYzNhxsN9 IzyZ9hq2ijHH6DahPZQS+Q5lAMqqWDhYPK60OsNdW9alHNNyIPFQa+Fx5KKCqk/B4vAoi6AKnwlY/ mc9ZaXHA==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1uAmJL-002ns7-0j; Fri, 02 May 2025 17:04:00 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 02 May 2025 17:03:59 +0800 Date: Fri, 02 May 2025 17:03:59 +0800 Message-Id: In-Reply-To: <41f8d44fe2b46ac2e1f0c54e550aa8bffe9e1cf3.1746176535.git.herbert@gondor.apana.org.au> References: <41f8d44fe2b46ac2e1f0c54e550aa8bffe9e1cf3.1746176535.git.herbert@gondor.apana.org.au> From: Herbert Xu Subject: [PATCH 2/3] crypto: shash - Mark shash algorithms as REQ_CHAIN To: Linux Crypto Mailing List Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mark shash algorithms with the REQ_CHAIN bit as they can handle virtual addresses as is. Signed-off-by: Herbert Xu --- crypto/shash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/crypto/shash.c b/crypto/shash.c index 4f446463340e..025f9f3a9d49 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -450,6 +450,7 @@ static int shash_prepare_alg(struct shash_alg *alg) base->cra_type = &crypto_shash_type; base->cra_flags |= CRYPTO_ALG_TYPE_SHASH; + base->cra_flags |= CRYPTO_ALG_REQ_CHAIN; /* * Handle missing optional functions. For each one we can either From patchwork Fri May 2 09:04:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 887263 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A89BC20F088 for ; Fri, 2 May 2025 09:04:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176648; cv=none; b=RDuK94vu0p0W1JgojYqSFLl0hUXfAuqyZAxPPeQm41qT/hmh+71vvHmXXx89+b7goI2xoquJSylM/wInnV9A8YV4iJs25ezU4smNZ6y7rQ16MuYyMYyNSknnwHIoJmhHFo/3V7QYbRIP85nnK45gXnITD5SkbvCX2x0K5W8EW0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746176648; c=relaxed/simple; bh=so2Lz7mBkHedkeBNNyDF7eiViz+DLUVidZXRQ56yEc0=; h=Date:Message-Id:In-Reply-To:References:From:Subject:To; b=e0i+4FxWzHYfpBjmgjca1/2eZhBPX7OzXQP5eAZ/GLBwrYF3AaZjCpvvR7E6YellASOujoOLHvdXmbdXsVgzgM12FBNJkUivwIFaX1kP6zfxlSpgD27j/Br6KNDUsiJKeVLkQ7CgIXEYUdh6a3+C/9XhzBgRsJPskjHr7CEA/Vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b=HprcNbGO; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b="HprcNbGO" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=To:Subject:From:References:In-Reply-To:Message-Id:Date:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Tl19dpGrL4QNXvMD5O2iyHltmPNju1iv+mD8IQyUn/w=; b=HprcNbGOLcYKUkgYe/KHjPzX2V AIsh7jIuusEJV4DJsYDYsfQdO9JUVOHgoEk3XQDbmhYEW2nnRLmb+C+qNqOZP4Bp1r1NFr7iumH2j H4vjvYUq2G8gUi0PftBeW+1RnEZhYG6hocFJR/brw2POA8fwIQ4tB0iDsKuhbZR9z66cN9+qrSJbY kxXHt5Vo3fpvdb3m6WFlRbI7/f6H1mfj0unxOCiUIczRQwaC6modV4eGS99PDEozbodDhmxUbD0Kg ln3m2GAZC5PJab12kLknZICqqETANc2n5rVYKGRtx4pbyWhzqhQTK+b8l5MjLxX9ILcK4CkR60/KV YyQrTPJA==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1uAmJN-002nsH-1t; Fri, 02 May 2025 17:04:02 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 02 May 2025 17:04:01 +0800 Date: Fri, 02 May 2025 17:04:01 +0800 Message-Id: <2e1012848db6e18f538a3917de700b782d0b38d6.1746176535.git.herbert@gondor.apana.org.au> In-Reply-To: <41f8d44fe2b46ac2e1f0c54e550aa8bffe9e1cf3.1746176535.git.herbert@gondor.apana.org.au> References: <41f8d44fe2b46ac2e1f0c54e550aa8bffe9e1cf3.1746176535.git.herbert@gondor.apana.org.au> From: Herbert Xu Subject: [PATCH 3/3] crypto: ahash - Enforce MAX_SYNC_HASH_REQSIZE for sync ahash To: Linux Crypto Mailing List Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: As sync ahash algorithms (currently there are none) are used without a fallback, ensure that they obey the MAX_SYNC_HASH_REQSIZE rule just like shash algorithms. Signed-off-by: Herbert Xu --- crypto/ahash.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/crypto/ahash.c b/crypto/ahash.c index cc9885d5cfd2..e3446581370c 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -768,6 +768,14 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm) if (err) goto out_free_sync_hash; + if (!ahash_is_async(hash) && crypto_ahash_reqsize(hash) > + MAX_SYNC_HASH_REQSIZE) { + if (tfm->__crt_alg->cra_exit) + tfm->__crt_alg->cra_exit(tfm); + err = -EINVAL; + goto out_free_sync_hash; + } + return 0; } @@ -775,6 +783,14 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm) if (err) goto out_free_sync_hash; + if (!ahash_is_async(hash) && crypto_ahash_reqsize(hash) > + MAX_SYNC_HASH_REQSIZE) { + if (alg->exit_tfm) + alg->exit_tfm(hash); + err = -EINVAL; + goto out_free_sync_hash; + } + return 0; out_free_sync_hash: @@ -954,6 +970,10 @@ static int ahash_prepare_alg(struct ahash_alg *alg) if (base->cra_reqsize && base->cra_reqsize < alg->halg.statesize) return -EINVAL; + if (!(base->cra_flags & CRYPTO_ALG_ASYNC) && + base->cra_reqsize > MAX_SYNC_HASH_REQSIZE) + return -EINVAL; + err = hash_prepare_alg(&alg->halg); if (err) return err;