From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (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 4671D2192F4 for ; Sun, 12 Oct 2025 20:39:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760301549; cv=none; b=DM5rtdmJM/R/qZKDSg/4RDDA+w2SMghQnEY2ARul1gy/jOrpda86niVpKe6fz/EjlDtXPo3rnX+HDEOSDtOr0WGnfPTise9DwCdKdVMVvLr6Jj1ZJdFo/lhneSdluMGKQwEuEtLXoN20NxSeADEmB+RXSKpafTvKC6tGs/u0vvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760301549; c=relaxed/simple; bh=lXpCMeLAuG7JE8yPh1RARhwCCjUzt/EJoeAJ9PZU5cI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dkEiWrKRP5twwJfNzzBBAGGNULQAALOvIMg4f5rT47E4/VpdYaFYY9MlEM4hipKRvzLDz08hyqoumeSwj+aJQhvNpAS6mikuzfBXWHZy7wh2ob+2VLwLuct2iZ7516jFXeh94ObP4sjtSY54OGBvtxh+0DAAjWfx40Mo0LUzdeU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ENJ3H1/D; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ENJ3H1/D" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1760301544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wa+ZvF07uqoBdmRF0RsswANJIIDhlDOXe9AbX7GaHgo=; b=ENJ3H1/DP9HbQdOto0jsi9bacB5f3LPrpTKm8Gcj48TdveEsWHQAZcDTV6DQe+ShTApZBA iub0wV6kYrta41n0drGCuNYIWGTp/y17e2wroCuaVx1V9TmtwhNC9OITZBTnjk6VMCTvmi 9+/V2+nTv8UFDeLTdJl/Dzf+LpbxoFQ= From: Thorsten Blum To: David Howells , Lukas Wunner , Ignat Korchagin , Herbert Xu , "David S. Miller" Cc: Thorsten Blum , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] crypto: asymmetric_keys - simplify asymmetric_key_hex_to_key_id Date: Sun, 12 Oct 2025 22:38:41 +0200 Message-ID: <20251012203841.60230-2-thorsten.blum@linux.dev> In-Reply-To: <20251012203841.60230-1-thorsten.blum@linux.dev> References: <20251012203841.60230-1-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Use struct_size() to calculate the number of bytes to allocate for the asymmetric key id. Add a local variable to store the hex data length instead of recalculating it. Return and forward the error code from __asymmetric_key_hex_to_key_id() directly instead of manually returning -EINVAL. No functional change. Signed-off-by: Thorsten Blum --- Changes in v2: - Keep 'ret' and forward the errno from __asymmetric_key_hex_to_key_id() as suggested by Lukas - Link to v1: https://lore.kernel.org/lkml/20251007185220.234611-3-thorsten.blum@linux.dev/ --- crypto/asymmetric_keys/asymmetric_type.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c index bd96f799757d..abd5cf419f83 100644 --- a/crypto/asymmetric_keys/asymmetric_type.c +++ b/crypto/asymmetric_keys/asymmetric_type.c @@ -229,6 +229,7 @@ struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id) { struct asymmetric_key_id *match_id; size_t asciihexlen; + size_t hexlen; int ret; if (!*id) @@ -237,14 +238,14 @@ struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id) if (asciihexlen & 1) return ERR_PTR(-EINVAL); - match_id = kmalloc(sizeof(struct asymmetric_key_id) + asciihexlen / 2, - GFP_KERNEL); + hexlen = asciihexlen / 2; + match_id = kmalloc(struct_size(match_id, data, hexlen), GFP_KERNEL); if (!match_id) return ERR_PTR(-ENOMEM); - ret = __asymmetric_key_hex_to_key_id(id, match_id, asciihexlen / 2); + ret = __asymmetric_key_hex_to_key_id(id, match_id, hexlen); if (ret < 0) { kfree(match_id); - return ERR_PTR(-EINVAL); + return ERR_PTR(ret); } return match_id; } -- 2.51.0