From nobody Sun Jun 14 20:11:33 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 E5D8138AC76; Thu, 16 Apr 2026 15:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354059; cv=none; b=cj5JMUw0jsipblGZa682m1CAEkwciCrDU9gZORd25UVWmmQOIagHmBdPFeQZ6qTkg1yHn3VFguHExrs5JQ6SK/mi2mdyDaYfK/4WDj+6iayDDewhvbVehw95Qkl8OmqN3n6fZeqoxjJhEuaoz6zu+yFwyjqEE+D7k0KB7lTWk0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354059; c=relaxed/simple; bh=KSW3oXd5KG4BXMp266u00qlZVulV/X7WE2gh+sk401w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zgw6cXIDPPo3CXOYsAu0nGa+ZRVQtMpuE+pROzB/A+vdnhkDQE+f3UBgzcx0539/qok729qgzTmPVN91XxvywxC1rF7NcHnWmOy4Q42eQ80hbfxtqZl0RxsIFliFlF/3BzwPrKDxkk2mBXcWXvmiUrLklIRmTaJRIuFPj18miSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=DtIfO9jT; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="DtIfO9jT" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63G7kMM02130871; Thu, 16 Apr 2026 15:40:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=BLQSW5ONXGVxURJ29 ktDSRluzzqwNUlSpl3meSRiUfo=; b=DtIfO9jTl5iFIxsDS84e142JZJM5EWN/T DIpBJZpt3gYq3GHdBhTUgdWtFE8VhsO92Oer1zY5suXLJ0iUPAWNAB9l25qZiSzR GROal13jZDRb+EpOVz1oNeudffg0cw2YVmde/8WW4MeiEhyMeOTCzrsjroFkYj7X wF8ePcqajwQMPo0OuiQEHn9uX9Ba5ysg6vmX/9tYGo4e/cXtKHW8J7ekI1LCVnFN OoWz3qIHINQB2RV2UG84mBCDfCfFf90tRqHFohc88g2M9ySEHNTB4nDO3HxZr4/7 sxtYdlqA23eOZxN+LMYmj+eh2Jy7Df4QSpS8SAOMoyq8F9eh1Corg== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dh89npaad-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:48 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63GEj8Ij031240; Thu, 16 Apr 2026 15:40:47 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dg10ykkv7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:47 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63GFejM16161100 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Apr 2026 15:40:45 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8FAF65803F; Thu, 16 Apr 2026 15:40:45 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D3C1058054; Thu, 16 Apr 2026 15:40:44 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Apr 2026 15:40:44 +0000 (GMT) From: Stefan Berger To: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org, zohar@linux.ibm.com, roberto.sassu@huawei.com, ebiggers@kernel.org, Stefan Berger Subject: [PATCH v3 1/4] integrity: Check for NULL returned by asymmetric_key_public_key Date: Thu, 16 Apr 2026 11:40:36 -0400 Message-ID: <20260416154039.1648083-2-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260416154039.1648083-1-stefanb@linux.ibm.com> References: <20260416154039.1648083-1-stefanb@linux.ibm.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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: UZMjdfT4mqU9tO9zBHQQezglrTPPa_89 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE2MDE0NiBTYWx0ZWRfXw7rsenU5mfub y3LCvkqNO6JS1sizpkNjN4MnjtLw/LPnF61whiWlXGf9OeVAfhMLzuILvzEJph2za7w4pM8hKsw dZuCSQE20HI+i3dRXMniX1ogzCpsi/OOGy1XjkZDLpYhkMCsR259pl+twRN4YGcf42bol41r2oE Z7OOvop5rpFRihXhC346/CD4juyMuuUPIp26Ou6E798+yGH22X6SYNCnOqvf6ZWxuEvX3eZR4wO zBmwJyqDUsQJqBMDZLD+WbeN2cVq3WHLo1stVH8XrwnvxXokyXhT6/TNo3DjGW+wiU/8vKbANZD fVYqtuE9SOUWlhbZQdSd52QnxAKrkvqDKS4S3wDQCGOPzhNQ/9akxJqqZqOX7RthPIBFrZZFOFy u21zrZGoM7/kNWo67Ji649mUjtnHw5p9JXtw4QKabnAHWu1gygKHxfTlGPTsFjoLmZ9zMex9jRD nzoWSGfg0xyCTqpg44w== X-Proofpoint-ORIG-GUID: UZMjdfT4mqU9tO9zBHQQezglrTPPa_89 X-Authority-Analysis: v=2.4 cv=FY4HAp+6 c=1 sm=1 tr=0 ts=69e10300 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=2XTCyd9mqVENZwl6Km4A:9 a=ZXulRonScM0A:10 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-16_03,2026-04-16_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604160146 Content-Type: text/plain; charset="utf-8" Check for a NULL pointer returned by asymmetric_key_public_key and return -ENOKEY in this case. Signed-off-by: Stefan Berger --- security/integrity/digsig_asymmetric.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/di= gsig_asymmetric.c index 6e68ec3becbd..a791ad43b3fb 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -108,6 +108,10 @@ int asymmetric_verify(struct key *keyring, const char = *sig, pks.hash_algo =3D hash_algo_name[hdr->hash_algo]; =20 pk =3D asymmetric_key_public_key(key); + if (!pk) { + ret =3D -ENOKEY; + goto out; + } pks.pkey_algo =3D pk->pkey_algo; if (!strcmp(pk->pkey_algo, "rsa")) { pks.encoding =3D "pkcs1"; --=20 2.53.0 From nobody Sun Jun 14 20:11:33 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 B7B4F3E3D93; Thu, 16 Apr 2026 15:41:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354062; cv=none; b=kRGT2tQ4DvG4vBeWSv9dEzNDkF/MsrUfLmDd2ggRwLnYSVZQBdn9mVNo9Sg1BQ1+HQCOcYFhDNCXlGsq7DoAoeh2MOmMv5IpaGVrMKNKwwNAzIkDtYWsbYVN9oM9vVprK62Wrna74XLJv9CrT5PRxt9gq+HIOhbTTt9yiqbf/tY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354062; c=relaxed/simple; bh=aTJrDqyfd3BxqK6ssxHLbipQlUcE8/Ox2nWq9xC2j6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DWBVU9s5ccoZrc5TZjRN84KfZDO5WK750NBnev3fvo0hJ6Tb4d+Ixn28DUIbRbukKTOPxNgcDtFDydRp4aLrvkC56ImoH2SMfK4YZ5Q2CY1v6rIY2/1CR70I2JjCFvVNjV2iyaT49OYF7IIHn0QjyAlZwVYYddJgc8d4XLVMmak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=THr4vOaN; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="THr4vOaN" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63G9icdW1804718; Thu, 16 Apr 2026 15:40:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=w5ausvGPfLI0fQUKs Gr3sFRK5EcfMKkvMq69wUBmlas=; b=THr4vOaNVAKI5b5FsPxqwp5TjV2coNTIG I9dR3Ry8TdvLUpOC0+VEq80onwhrl55blPprn1qGcWspkMHAbbTQ2FZSnK+z/dOW j2OlW2eI9kZYF1A7cznwscW+tXYjigkJQzgHLKdoHf2XMHKdCXEjYUSc1LniYZM8 1gC2klFxL2KZPMSL2O+npIQSPqVfz+uqa8jaEzKEqs0QkjjiIM9cSRnmxdMmYMPQ uRcpf1ujVQYZ6xTchiT2tia3JA1IOqFV8DdmIGt1k9ytdH3qOwoURciGUqR7L0ZN UVi1dwmf823ij1jAeWsVAZXK7IXg1sla1DapqEhxzjDvOJGizDJtg== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dh89kdb7m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:49 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63GCxrbH003385; Thu, 16 Apr 2026 15:40:48 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4djbh953d0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:48 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63GFekfe12386900 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Apr 2026 15:40:46 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 702AD5804E; Thu, 16 Apr 2026 15:40:46 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B40A55803F; Thu, 16 Apr 2026 15:40:45 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Apr 2026 15:40:45 +0000 (GMT) From: Stefan Berger To: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org, zohar@linux.ibm.com, roberto.sassu@huawei.com, ebiggers@kernel.org, Stefan Berger Subject: [PATCH v3 2/4] integrity: Check that algo parameter is within valid range Date: Thu, 16 Apr 2026 11:40:37 -0400 Message-ID: <20260416154039.1648083-3-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260416154039.1648083-1-stefanb@linux.ibm.com> References: <20260416154039.1648083-1-stefanb@linux.ibm.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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: h4jjSS45nKgh_OA_YT8QTWRcMcTluYfr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE2MDE0NiBTYWx0ZWRfX9Rsr9UbeRnFV 5gIYkJpUovg+fEwWPtP3uFrPLAnfY0scOdSaXFCKFAzvCzK9R/IHCthTVr7BI6uqpOeaYMnznDZ ZCHp47UcKweaPYxFRVQYr8+u9YQHsK/36rW1x76SS0MrSE4FcislJ1PsVwIAxY3Rqw+4p0R+HB7 ktcfkgOnC99qdp1TojsMgfNjn/tN7V99yvSECq3WvGSix4RxTGa/H/OEm8hagBNMisE1ZqKbs35 B4nQpptBlr2qJfDMZSzboB5Vcy1F6OU3tNcGqoJcDKQUVIkP5RahsgHvhBE5NwjbGaZSw3YAG2U p+rI92cpXRKzfVwqd54tq3KTrFDwvEqeKNPxHUaalVbW3ONZfDPDBiA6Yq9/eZ9W2t6h5OZd2Oy FAD0MXJWp9ozsWDseoqOCJrh1HCD35BGJx5DEYfdwpNO6P6rONL29nRgCvLVbaCu/ewgzlIhdwt +/UR65B6huIf/wOYDNg== X-Proofpoint-ORIG-GUID: h4jjSS45nKgh_OA_YT8QTWRcMcTluYfr X-Authority-Analysis: v=2.4 cv=W60IkxWk c=1 sm=1 tr=0 ts=69e10301 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=obyXdEPKXPE7isLz8FsA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-16_03,2026-04-16_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604160146 Content-Type: text/plain; charset="utf-8" Check that the algo parameter passed to calc_file_id_hash is within valid range. Do this in asymmetric_verify_v3 since this value will also be passed to a hashless signature verification function from here. Signed-off-by: Stefan Berger --- security/integrity/digsig_asymmetric.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/di= gsig_asymmetric.c index a791ad43b3fb..ed171a627d18 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -139,7 +139,7 @@ int asymmetric_verify(struct key *keyring, const char *= sig, /* * calc_file_id_hash - calculate the hash of the ima_file_id struct data * @type: xattr type [enum evm_ima_xattr_type] - * @algo: hash algorithm [enum hash_algo] + * @algo: hash algorithm [enum hash_algo]; caller must ensure valid value * @digest: pointer to the digest to be hashed * @hash: (out) pointer to the hash * @@ -187,6 +187,9 @@ int asymmetric_verify_v3(struct key *keyring, const cha= r *sig, int siglen, struct ima_max_digest_data hash; int rc; =20 + if (algo >=3D HASH_ALGO__LAST) + return -ENOPKG; + rc =3D calc_file_id_hash(hdr->type, algo, data, &hash); if (rc) return -EINVAL; --=20 2.53.0 From nobody Sun Jun 14 20:11:33 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 C503022A80D; Thu, 16 Apr 2026 15:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354124; cv=none; b=ZfNUSVQaj/kMmxyFsVO/vyb8SC28zF1BvCjSYZCTU9s2bELUagTWx0W1rWqr8XiXrsqjSurNyWt9BcDc0zTUohwScsgcLt/AMCXgEt1lUVH1d0VWIZWh5Wb2qO2zqYIK9cIa2G365KVClY+77//VOI2wjGLzjCWFOo7KWX7yDSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354124; c=relaxed/simple; bh=Rgf8Y0sL+2EzuyaQuiNdJwtnN/IKPsFTL9EbJ/ggnPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Epw1LzmRUDxKDPOn/JGaa6/MZXJ5tEKaLyJ0pkd/He65elu+0EHsSYrlz4X2A45CUonf8zQKHpBxQ9YBnE2V/3bcO98rIj9XnCCmt6L0p5/y/b++rfK6ObJz9A/5slI+4NwDIUubMAd+1hNbXoSxqV8xs4V1vg6BqOuLQo+BWK0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=ewrprYnw; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="ewrprYnw" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63G9rHL41833140; Thu, 16 Apr 2026 15:40:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=TE5km50Vc83kAjEgo Qf5mL5coAwifb5RbTpDZdm3SA8=; b=ewrprYnwhRkmiGWX35dcuwTqQRz3DyJHM 5i+Wky3S9+tlz6z+gwPVLq2W/93YBCIGE+iidyUAwfep50c89tkAfirOnH7S3kR4 264HmN7YVdNcdK1xHnvjfprUnDYAkawqjnVbtoHaHdgb4E8VUy+Jgjs6NJzlIQ9Z zofsm1p3gVbFlWYeiiw/JeK0rrQWFJXdTKkXHlsl5f58YEXa44bvI4raEaFouScw ZupTfUBQ/h3W1mo3UDvQtWqRW2DppBWNFI+xFHinEtyaibTBAx7/vMfjGeG2oMo6 iOoySBLzrO/n6ahkjlm2Qwr3O3MMO1rIyaCpvRI98wRCVKweWG1+Q== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dh89rp8xa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:50 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63GBuMwZ003594; Thu, 16 Apr 2026 15:40:49 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dg1mnkfs6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:49 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63GFel1H65405274 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Apr 2026 15:40:47 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4841B5804E; Thu, 16 Apr 2026 15:40:47 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9491B5803F; Thu, 16 Apr 2026 15:40:46 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Apr 2026 15:40:46 +0000 (GMT) From: Stefan Berger To: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org, zohar@linux.ibm.com, roberto.sassu@huawei.com, ebiggers@kernel.org, Stefan Berger Subject: [PATCH v3 3/4] integrity: Refactor asymmetric_verify for reusability Date: Thu, 16 Apr 2026 11:40:38 -0400 Message-ID: <20260416154039.1648083-4-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260416154039.1648083-1-stefanb@linux.ibm.com> References: <20260416154039.1648083-1-stefanb@linux.ibm.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 X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE2MDE0NiBTYWx0ZWRfX6RhnbVqPmk0V kyGE4dgfAls/LXhkin60u718t8RSjL2xzniEscc69YTyJYc2odkdHWIGI8Bzr7XkuU93nUDdQYg +q6Qepldc/nE6vj2Xfhxz2P+77/FkHNDQ8WdaU2pvCpJWuCXPrAylXjX2SP+pUab/PDWwoaEs8B Xnii7etAB/E19gVY3xFJAeeV12Ptr1gahOPWLxAhI3ROJKmMWwZQdNbt0Kd6/N1Gm3/AkeGYm/t Kj91KqNEuHIDs6AnEesvseYBJ6ouI0YbCcvG218MhmZ1NcVqDqqB3I1OH56TA49XKx0gMy1snSJ lTMCPsAES6y46KGK/FUegoWKKH0EyRWyXricoliWiSddn8Gvn7WNF1lmRqak1W1wUFE84R/3Ec/ R+ZomPJ81zOTZAvxHQWnLpXhAHeEgHoRcfOUuoiNcXTEOs1BVxo6miCwmd99nVML7WxnDYlg1XE iIl9aUzqcaGpTlSMMnw== X-Proofpoint-ORIG-GUID: k01mjgMGWmLyHlIbLFvyKNCNzwqldau5 X-Proofpoint-GUID: k01mjgMGWmLyHlIbLFvyKNCNzwqldau5 X-Authority-Analysis: v=2.4 cv=fYidDUQF c=1 sm=1 tr=0 ts=69e10302 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=0zGWYjSCjxdcbThUK0gA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-16_03,2026-04-16_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 priorityscore=1501 spamscore=0 suspectscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604160146 Content-Type: text/plain; charset="utf-8" Refactor asymmetric_verify for reusability. Have it call asymmetric_verify_common with the signature verification key and the public_key structure as parameters. sigv3 support for ML-DSA will need to check the public key type first to decide how to do the signature verification and therefore will have these parameters available for calling asymmetric_verify_common. Signed-off-by: Stefan Berger --- v3: - added kernel-doc - NULL pointer check on asymmetric_key_public_key return value --- security/integrity/digsig_asymmetric.c | 62 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/di= gsig_asymmetric.c index ed171a627d18..a4eb73bba6d2 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -79,18 +79,25 @@ static struct key *request_asymmetric_key(struct key *k= eyring, uint32_t keyid) return key; } =20 -int asymmetric_verify(struct key *keyring, const char *sig, - int siglen, const char *data, int datalen) +/** + * asymmetric_verify_common -- sigv2 and sigv3 common verify function + * @key: The key to use for signature verification; caller must free it + * @pk: The associated public key; must not be NULL + * @sig: The xattr signature + * @siglen: The length of the xattr signature; must be at least + * sizeof(struct signature_v2_hdr) + * @data: The data to verify the signature on + * @datalen: Length of @data + */ +static int asymmetric_verify_common(const struct key *key, + const struct public_key *pk, + const char *sig, int siglen, + const char *data, int datalen) { - struct public_key_signature pks; struct signature_v2_hdr *hdr =3D (struct signature_v2_hdr *)sig; - const struct public_key *pk; - struct key *key; + struct public_key_signature pks; int ret; =20 - if (siglen <=3D sizeof(*hdr)) - return -EBADMSG; - siglen -=3D sizeof(*hdr); =20 if (siglen !=3D be16_to_cpu(hdr->sig_size)) @@ -99,19 +106,9 @@ int asymmetric_verify(struct key *keyring, const char *= sig, if (hdr->hash_algo >=3D HASH_ALGO__LAST) return -ENOPKG; =20 - key =3D request_asymmetric_key(keyring, be32_to_cpu(hdr->keyid)); - if (IS_ERR(key)) - return PTR_ERR(key); - memset(&pks, 0, sizeof(pks)); =20 pks.hash_algo =3D hash_algo_name[hdr->hash_algo]; - - pk =3D asymmetric_key_public_key(key); - if (!pk) { - ret =3D -ENOKEY; - goto out; - } pks.pkey_algo =3D pk->pkey_algo; if (!strcmp(pk->pkey_algo, "rsa")) { pks.encoding =3D "pkcs1"; @@ -131,11 +128,38 @@ int asymmetric_verify(struct key *keyring, const char= *sig, pks.s_size =3D siglen; ret =3D verify_signature(key, &pks); out: - key_put(key); pr_debug("%s() =3D %d\n", __func__, ret); return ret; } =20 +int asymmetric_verify(struct key *keyring, const char *sig, + int siglen, const char *data, int datalen) +{ + struct signature_v2_hdr *hdr =3D (struct signature_v2_hdr *)sig; + const struct public_key *pk; + struct key *key; + int ret; + + if (siglen <=3D sizeof(*hdr)) + return -EBADMSG; + + key =3D request_asymmetric_key(keyring, be32_to_cpu(hdr->keyid)); + if (IS_ERR(key)) + return PTR_ERR(key); + pk =3D asymmetric_key_public_key(key); + if (!pk) { + ret =3D -ENOKEY; + goto out; + } + + ret =3D asymmetric_verify_common(key, pk, sig, siglen, data, datalen); + +out: + key_put(key); + + return ret; +} + /* * calc_file_id_hash - calculate the hash of the ima_file_id struct data * @type: xattr type [enum evm_ima_xattr_type] --=20 2.53.0 From nobody Sun Jun 14 20:11:33 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 2A60B3ACA7C; Thu, 16 Apr 2026 15:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354063; cv=none; b=Yu6+Ipu/ZuvTKSo8SsdYZtTmIBDImEGrS1fWiCVGzjQz/nVQWHNELn4XPLm1i0Y2cQksvCeskuZ4Cjy+GjpmSGDukVNf6vR/cFb5X4k9aiJ6E27sjTcODW1kRQDqaBFKKNpRfP8C9T8Cp5TPU2ZyKALP5mHG5YtWuBQYb4soL5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776354063; c=relaxed/simple; bh=jKkY1DW1o2uZ8cBOITo74r/GLnXXZXS2gNDmAUtsaNM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gneOsFf1eLzVI5aAnkH7pqlGnq7JzRZ/RVMFMtcYsAQFzth1u1hb1NiIaDVgTCzJ++JnGXB3AS9GMgGyGRc/L9zhlSIgbqEtcSe87hRR+5Gy6rloB8mWgL0cCpTtq2h2VVLI5i1r8Du0+9yyOfGIehJgKQNngRtxV+TsGdnuhhA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=T7hyl2tp; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="T7hyl2tp" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63G2h2fB1804464; Thu, 16 Apr 2026 15:40:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=nHn0510uijP7eaJx7 OGZT/Jhy0mOgnJ0u3FOhaWquq0=; b=T7hyl2tpSCsiIBvMNhuxhYghq7mad3nWE 14CUmjg7P1Ro/hHncbbkcFq968d2tSwGG1t/ioNy42p7MhoPhX9IIbVLiXNM2UEG AvXnerBvQx4tIuqJOY3whBqm4WrTXX5btLutZBb5no+CPn2ytwoso5tU4jbUvVKq 9fhK5RJmb7zS2Hy9YtS9OXklnVaH4lTd5zr/BnEIJaTf1WuXQ9vjRZDasX6EroMN KRAthbIkbP9EgbVDDr4b7zavKSG+lwRkmoNjGHbobpNGn4SUwpTuDblswKZDmx1T CDP1cMCQcRgUrYVgKP2fr/i9z1vKUstfpiprrwMnx2Hdkbc7O19NQ== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dh89kdb7q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:50 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 63GCk8oZ003379; Thu, 16 Apr 2026 15:40:50 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4djbh953d1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2026 15:40:50 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63GFemHV28508902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Apr 2026 15:40:48 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F5815804E; Thu, 16 Apr 2026 15:40:48 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D43F5803F; Thu, 16 Apr 2026 15:40:47 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Apr 2026 15:40:47 +0000 (GMT) From: Stefan Berger To: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org, zohar@linux.ibm.com, roberto.sassu@huawei.com, ebiggers@kernel.org, Stefan Berger Subject: [PATCH v3 4/4] integrity: Add support for sigv3 verification using ML-DSA keys Date: Thu, 16 Apr 2026 11:40:39 -0400 Message-ID: <20260416154039.1648083-5-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260416154039.1648083-1-stefanb@linux.ibm.com> References: <20260416154039.1648083-1-stefanb@linux.ibm.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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: AVkZHtKH1cAhDNA7H7qV9XZFKpT-f3GT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE2MDE0NiBTYWx0ZWRfXzUp6tydPMLiz L8DRPSJxKAnTVc2E+1Apy88AW8IqcFb7ccSqOhyAQoSWsgnkt+C6SBzWFy9geLlNm15iF1JuyZp pHLSMzTfrlb9ICRhfC3QzEX7ufZ3fncdpD4cOaJiv+PSIftAuMGmKAnJSDmtc+At8M99BxGylV+ PCbhg/bJ9M+3G1pc2noymLnJvD9CdMVKsCRTCLawiO7Qjv1Qgd2kL0I8I5YUsfBzYPLHMeb74JW zhf0SrZkjtTYkT/OJzxoYIav7nXPrIrkNgo6AJu07do0tB/NRe5Hpr5ki1XxwJ4Bhy6dMYUdaPr Fm4YbdyQnT+YbnCXmq10kcd1n/ljRG6fr/S+lbAK4X/LV0OUk6wnoHMcd5+g2DJU+jAoaz7Iluu 0pdfwr8d39I2IKo0yuR9fU+30Voyhr++yX5DeXiLuNjdqBKez6jHthKLGaKokixw6xhhDyEPvlM pS8pk1okx95KYUedKrw== X-Proofpoint-ORIG-GUID: AVkZHtKH1cAhDNA7H7qV9XZFKpT-f3GT X-Authority-Analysis: v=2.4 cv=W60IkxWk c=1 sm=1 tr=0 ts=69e10302 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=d50OJDrPnbFUXeFJyOIA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-16_03,2026-04-16_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604160146 Content-Type: text/plain; charset="utf-8" Add support for sigv3 signature verification using ML-DSA in pure mode. When a sigv3 signature is verified, first check whether the key to use for verification is an ML-DSA key and therefore uses a hashless signature verification scheme. The hashless signature verification method uses the ima_file_id structure directly for signature verification rather than its digest. Suggested-by: Eric Biggers Signed-off-by: Stefan Berger --- v3: - Renamed err_exit label to 'out' - Updated kernel-doc for new function - Relying on algo verified by caller of asymmetric_verify_v3_hashless - NULL pointer check on asymmetric_key_public_key return value v2: Set hash_algo in public_key_signature to "none" --- security/integrity/digsig_asymmetric.c | 89 ++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 5 deletions(-) diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/di= gsig_asymmetric.c index a4eb73bba6d2..b4c23a0ed68f 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -204,20 +204,99 @@ static int calc_file_id_hash(enum evm_ima_xattr_type = type, return rc; } =20 +/** + * asymmetric_verify_v3_hashless - Use hashless signature verification on = sigv3 + * @key: The key to use for signature verification; caller must free it + * @pk: The associated public key; must not be NULL + * @encoding: The encoding the key type uses + * @sig: The xattr signature + * @siglen: The length of the xattr signature; must be at least + * sizeof(struct signature_v2_hdr) + * @algo: hash algorithm [enum hash_algo]; caller must ensure valid value + * @digest: The file digest + * + * Create an ima_file_id structure and use it for signature verification + * directly. This can be used for ML-DSA in pure mode for example. + */ +static int asymmetric_verify_v3_hashless(struct key *key, + const struct public_key *pk, + const char *encoding, + const char *sig, int siglen, + u8 algo, + const u8 *digest) +{ + struct signature_v2_hdr *hdr =3D (struct signature_v2_hdr *)sig; + struct ima_file_id file_id =3D { + .hash_type =3D hdr->type, + .hash_algorithm =3D algo, + }; + size_t digest_size =3D hash_digest_size[algo]; + struct public_key_signature pks =3D { + .m =3D (u8 *)&file_id, + .m_size =3D sizeof(file_id) - (HASH_MAX_DIGESTSIZE - digest_size), + .s =3D hdr->sig, + .s_size =3D siglen - sizeof(*hdr), + .pkey_algo =3D pk->pkey_algo, + .hash_algo =3D "none", + .encoding =3D encoding, + }; + int ret; + + if (hdr->type !=3D IMA_VERITY_DIGSIG && + hdr->type !=3D EVM_IMA_XATTR_DIGSIG && + hdr->type !=3D EVM_XATTR_PORTABLE_DIGSIG) + return -EINVAL; + + if (pks.s_size !=3D be16_to_cpu(hdr->sig_size)) + return -EBADMSG; + + memcpy(file_id.hash, digest, digest_size); + + ret =3D verify_signature(key, &pks); + pr_debug("%s() =3D %d\n", __func__, ret); + return ret; +} + int asymmetric_verify_v3(struct key *keyring, const char *sig, int siglen, const char *data, int datalen, u8 algo) { struct signature_v2_hdr *hdr =3D (struct signature_v2_hdr *)sig; struct ima_max_digest_data hash; + const struct public_key *pk; + struct key *key; int rc; =20 if (algo >=3D HASH_ALGO__LAST) return -ENOPKG; =20 - rc =3D calc_file_id_hash(hdr->type, algo, data, &hash); - if (rc) - return -EINVAL; + if (siglen <=3D sizeof(*hdr)) + return -EBADMSG; =20 - return asymmetric_verify(keyring, sig, siglen, hash.digest, - hash.hdr.length); + key =3D request_asymmetric_key(keyring, be32_to_cpu(hdr->keyid)); + if (IS_ERR(key)) + return PTR_ERR(key); + + pk =3D asymmetric_key_public_key(key); + if (!pk) { + rc =3D -ENOKEY; + goto out; + } + if (!strncmp(pk->pkey_algo, "mldsa", 5)) { + rc =3D asymmetric_verify_v3_hashless(key, pk, "raw", + sig, siglen, algo, data); + } else { + rc =3D calc_file_id_hash(hdr->type, algo, data, &hash); + if (rc) { + rc =3D -EINVAL; + goto out; + } + + rc =3D asymmetric_verify_common(key, pk, sig, siglen, hash.digest, + hash.hdr.length); + } + +out: + key_put(key); + + return rc; } --=20 2.53.0