From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5C758388361; Mon, 20 Apr 2026 06:37:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776667026; cv=none; b=tFQTvnHOo7Ac0bJaOrctN0xIKDeiRDh1bV0LACCmlpJ3U+KZyPwxXTOtCNdJGFZRoY1HPhPMusi/GzTB02XbFyeJ6IUXIaxoP6PgEHh3zkK/D6s+PMfV2OO3e7+4nyJhZJP6bJ3YzE6NQloVB1GFrrqpWpj1nFyiYQW7OHibPgE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776667026; c=relaxed/simple; bh=KsjL1I/qHqZAMOvNImGVboveH2me9CZFpEy2B+wUoBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b+Q2xsyY2YCPG67nAaB3MxEX/WaZO6o6CRRwlkVphTwrMTGWzPgPrBZySy+7yKZexppA3BnL7xBTUEwZmPeWu3ZQ3E86En85rTWQqwBcP0sXavjhaODKknYrkCYRQNI1eC++HdMOJyRUnbQwFFFNdnCQwfjYVH6QcAdI2PCCBlc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bmeYFYCZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bmeYFYCZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB669C2BCB8; Mon, 20 Apr 2026 06:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776667026; bh=KsjL1I/qHqZAMOvNImGVboveH2me9CZFpEy2B+wUoBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bmeYFYCZg65JEytfejrXz4pvbqhdNP0exExTUQ8zraS1Yhr72B3PN/e2FOjDGaRh4 otG9Ge9rqSeJTfh8NxZuQcui5kZazEjxV1AjhORZKcYcexpvJ308VT+jpB8ESYsTzM PzG/Ds4n+rYw5w7GNbebiWtZNI99FFS5sUzxwh/W2OJxhgysCjZCPP476msDBcpDNM PajXjs0NsUjrUIdivAwS7vwFACxc5yseJlDS8Qm4XAcXIhxu24XO1AZIPYmGZnwhEv 6M9jBUROeLm2yIn4VV5PVk06eL/SFsSN00KaochRtV8ppJNkh/038v8xMhvS8Tfr3M OyQ1ipmciM6+Q== From: Eric Biggers To: linux-crypto@vger.kernel.org, Herbert Xu Cc: linux-kernel@vger.kernel.org, Stephan Mueller , "Jason A . Donenfeld" , Eric Biggers Subject: [PATCH 21/38] crypto: drbg - Embed V and C into struct drbg_state Date: Sun, 19 Apr 2026 23:34:05 -0700 Message-ID: <20260420063422.324906-22-ebiggers@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420063422.324906-1-ebiggers@kernel.org> References: <20260420063422.324906-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now that the sizes of V and C are known at compile time, embed them into struct drbg_state rather than using separate allocations. Signed-off-by: Eric Biggers --- crypto/drbg.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/crypto/drbg.c b/crypto/drbg.c index 34a7cbdda1f1..e62bde7aab43 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -140,14 +140,12 @@ enum drbg_seed_state { */ #define DRBG_MAX_ADDTL (U32_MAX - 1) struct drbg_state { struct mutex drbg_mutex; /* lock around DRBG */ - unsigned char *V; /* internal state -- 10.1.2.1 1a */ - unsigned char *Vbuf; - unsigned char *C; /* current key -- 10.1.2.1 1b */ - unsigned char *Cbuf; + u8 V[DRBG_STATE_LEN]; /* internal state -- 10.1.2.1 1a */ + u8 C[DRBG_STATE_LEN]; /* current key -- 10.1.2.1 1b */ /* Number of RNG requests since last reseed -- 10.1.2.1 1c */ size_t reseed_ctr; size_t reseed_threshold; void *priv_data; /* Cipher handle */ @@ -490,16 +488,12 @@ static int drbg_seed(struct drbg_state *drbg, struct drbg_string *pers, /* Free all substructures in a DRBG state without the DRBG state structure */ static inline void drbg_dealloc_state(struct drbg_state *drbg) { if (!drbg) return; - kfree_sensitive(drbg->Vbuf); - drbg->Vbuf = NULL; - drbg->V = NULL; - kfree_sensitive(drbg->Cbuf); - drbg->Cbuf = NULL; - drbg->C = NULL; + memzero_explicit(drbg->V, sizeof(drbg->V)); + memzero_explicit(drbg->C, sizeof(drbg->C)); drbg->reseed_ctr = 0; drbg->core = NULL; } /* @@ -511,28 +505,12 @@ static inline int drbg_alloc_state(struct drbg_state *drbg) int ret = -ENOMEM; ret = drbg_init_hash_kernel(drbg); if (ret < 0) goto err; - - drbg->Vbuf = kmalloc(DRBG_STATE_LEN + ret, GFP_KERNEL); - if (!drbg->Vbuf) { - ret = -ENOMEM; - goto fini; - } - drbg->V = PTR_ALIGN(drbg->Vbuf, ret + 1); - drbg->Cbuf = kmalloc(DRBG_STATE_LEN + ret, GFP_KERNEL); - if (!drbg->Cbuf) { - ret = -ENOMEM; - goto fini; - } - drbg->C = PTR_ALIGN(drbg->Cbuf, ret + 1); - return 0; -fini: - drbg_fini_hash_kernel(drbg); err: drbg_dealloc_state(drbg); return ret; } -- 2.53.0