Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7DC8BC83F1B for ; Fri, 11 Jul 2025 21:12:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uaL2F-0000qv-FS; Fri, 11 Jul 2025 17:11:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uaL1u-0000es-Se; Fri, 11 Jul 2025 17:11:39 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uaL1r-0002tl-Cf; Fri, 11 Jul 2025 17:11:38 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56BFp60K005980; Fri, 11 Jul 2025 21:11:32 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=VeYO0/kzDzArzsqOp jx2fGRfFHh0oqKxNjmqUM2tCgw=; b=aEmpQmo9cLFL6iG4XRhLpdi6opqDcrqg2 iIShY53KKjYz+Xnr65SXpqUfzEF0mBWKVZMQn8jRu0kiDLBDEpPD0hs2+0HMqqw8 q0dnEzpM6kFjo0L1JAlSBPnklD/4qUYR2Bzoavn6Q9p5LFyoNh8vUr1+tYWixW6O fq++1YnNh6uxWU/2hOnV9d2TI0sZAV2tlljyXJaxLaD8G7s+bXturHECI6ua1shp YUS+U5uTpjJWNYZISAHvSGEAalVZUjM6ApR5E3nMxO3fMH8UyuDk29OZrg9T7HtF 4vym8Bp43GcbxjiVk7vkTxBmnnfR0W2VtXi7cw285O99DMdNbfmNw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47puk4n6t5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Jul 2025 21:11:32 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 56BL1Fk3013555; Fri, 11 Jul 2025 21:11:31 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 47qgkmcbcw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Jul 2025 21:11:31 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 56BLBUgS27591164 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 21:11:30 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E6E0E5805C; Fri, 11 Jul 2025 21:11:29 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6CB9D5805B; Fri, 11 Jul 2025 21:11:28 +0000 (GMT) Received: from fedora-workstation.ibmuc.com (unknown [9.61.25.251]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 11 Jul 2025 21:11:28 +0000 (GMT) From: Zhuoying Cai To: thuth@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, david@redhat.com, pbonzini@redhat.com, jrossi@linux.ibm.com, qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: walling@linux.ibm.com, jjherne@linux.ibm.com, pasic@linux.ibm.com, borntraeger@linux.ibm.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, iii@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v4 12/28] s390x/diag: Implement DIAG 508 subcode 1 for signature verification Date: Fri, 11 Jul 2025 17:10:48 -0400 Message-ID: <20250711211105.439554-13-zycai@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250711211105.439554-1-zycai@linux.ibm.com> References: <20250711211105.439554-1-zycai@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDE1NiBTYWx0ZWRfX0YUfmHRndB5l o7oGiuGvQvvJaIUasD0ryX8GeApPIn6o0ETVJyopOQ83JT8qG+l3Q1e72QFQGaLI7osH18t3t25 Dy54ieOIFxTvvo/4TQYlZJmNRKdG/CYwAWSqHXcYxZ6dnAMygTUjBqjo6NbLZpZMMhnybZYdivV FIpsizLa26PUjXB9s9B6GF6K63M9wvFnuAZxKc6qVn4kWmQI2wfb7NwOfHQmLFUPUV/ExOYmKuv S3rSwBmxE2Ek6cnakmLtcMYVaQEpbaTvsgS196v0NUrBwkR+AlJGilU3LiT62BSTtygak+OCmTB 4GoX36CuwpLcg89KdLWLF6RxMoYQsytuIrROR1RXUs5hdXw0VkcPz1aOHi/1FWr++CgzxrV5twE n4gEj6JSsFowEUHsHV4x7mdH/yPXmLw9Vlryyb7gzjjK7RVXtZ2JJN4eFUfFQMDpWD0498hW X-Authority-Analysis: v=2.4 cv=XYeJzJ55 c=1 sm=1 tr=0 ts=68717e04 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=Wb1JkmetP80A:10 a=VnNF1IyMAAAA:8 a=QUeH2xgz5R9ERI6wYg0A:9 X-Proofpoint-ORIG-GUID: R8XGAoO96W_ImiQE11_AD77ayUGSIzdU X-Proofpoint-GUID: R8XGAoO96W_ImiQE11_AD77ayUGSIzdU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-11_06,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 suspectscore=0 mlxscore=0 impostorscore=0 phishscore=0 bulkscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507110156 Received-SPF: pass client-ip=148.163.156.1; envelope-from=zycai@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Collin Walling DIAG 508 subcode 1 performs signature-verification on signed components. A signed component may be a Linux kernel image, or any other signed binary. **Verification of initrd is not supported.** The instruction call expects two item-pairs: an address of a device component, an address of the analogous signature file (in PKCS#7 DER format), and their respective lengths. All of this data should be encapsulated within a Diag508SignatureVerificationBlock, with the CertificateStoreInfo fields ignored. The DIAG handler will read from the provided addresses to retrieve the necessary data, parse the signature file, then perform the signature-verification. Because there is no way to correlate a specific certificate to a component, each certificate in the store is tried until either verification succeeds, or all certs have been exhausted. The subcode value is denoted by setting the second-to-left-most bit of a 2-byte field. A return code of 1 indicates success, and the index and length of the corresponding certificate will be set in the CertificateStoreInfo portion of the SigVerifBlock. The following values indicate failure: 0x0202: component data is invalid 0x0302: signature is not in PKCS#7 format 0x0402: signature-verification failed Signed-off-by: Collin Walling Signed-off-by: Zhuoying Cai --- include/hw/s390x/ipl/diag508.h | 23 +++++++ target/s390x/diag.c | 112 ++++++++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 1 deletion(-) diff --git a/include/hw/s390x/ipl/diag508.h b/include/hw/s390x/ipl/diag508.h index 6281ad8299..c99c6705c0 100644 --- a/include/hw/s390x/ipl/diag508.h +++ b/include/hw/s390x/ipl/diag508.h @@ -11,5 +11,28 @@ #define S390X_DIAG508_H #define DIAG_508_SUBC_QUERY_SUBC 0x0000 +#define DIAG_508_SUBC_SIG_VERIF 0x8000 + +#define DIAG_508_RC_OK 0x0001 +#define DIAG_508_RC_NO_CERTS 0x0102 +#define DIAG_508_RC_INVAL_COMP_DATA 0x0202 +#define DIAG_508_RC_INVAL_PKCS7_SIG 0x0302 +#define DIAG_508_RC_FAIL_VERIF 0x0402 + +struct Diag508CertificateStoreInfo { + uint8_t idx; + uint8_t reserved[7]; + uint64_t len; +}; +typedef struct Diag508CertificateStoreInfo Diag508CertificateStoreInfo; + +struct Diag508SignatureVerificationBlock { + Diag508CertificateStoreInfo csi; + uint64_t comp_len; + uint64_t comp_addr; + uint64_t sig_len; + uint64_t sig_addr; +}; +typedef struct Diag508SignatureVerificationBlock Diag508SignatureVerificationBlock; #endif diff --git a/target/s390x/diag.c b/target/s390x/diag.c index e01ea0b289..0e7e594bf5 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -518,9 +518,107 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) env->regs[r1 + 1] = rc; } +static int diag_508_verify_sig(uint8_t *cert, size_t cert_size, + uint8_t *comp, size_t comp_size, + uint8_t *sig, size_t sig_size) +{ + g_autofree uint8_t *sig_pem = NULL; + size_t sig_size_pem; + int rc; + + /* + * PKCS#7 signature with DER format + * Convert to PEM format for signature verification + */ + rc = qcrypto_pkcs7_convert_sig_pem(sig, sig_size, &sig_pem, &sig_size_pem, NULL); + if (rc < 0) { + return -1; + } + + /* + * Ignore errors from signature format convertion and verification, + * because currently in the certificate lookup process. + * + * Any error is treated as a verification failure, + * and the final result (verified or not) will be reported later. + */ + rc = qcrypto_x509_verify_sig(cert, cert_size, + comp, comp_size, + sig_pem, sig_size_pem, NULL); + if (rc < 0) { + return -1; + } + + return 0; +} + +static int handle_diag508_sig_verif(uint64_t addr, size_t csi_size, size_t svb_size, + S390IPLCertificateStore *qcs) +{ + int rc; + int verified; + uint64_t comp_len, comp_addr; + uint64_t sig_len, sig_addr; + g_autofree uint8_t *svb_comp = NULL; + g_autofree uint8_t *svb_sig = NULL; + g_autofree Diag508SignatureVerificationBlock *svb = NULL; + + if (!qcs || !qcs->count) { + return DIAG_508_RC_NO_CERTS; + } + + svb = g_new0(Diag508SignatureVerificationBlock, 1); + cpu_physical_memory_read(addr, svb, svb_size); + + comp_len = be64_to_cpu(svb->comp_len); + comp_addr = be64_to_cpu(svb->comp_addr); + sig_len = be64_to_cpu(svb->sig_len); + sig_addr = be64_to_cpu(svb->sig_addr); + + if (!comp_len || !comp_addr) { + return DIAG_508_RC_INVAL_COMP_DATA; + } + + if (!sig_len || !sig_addr) { + return DIAG_508_RC_INVAL_PKCS7_SIG; + } + + svb_comp = g_malloc0(comp_len); + cpu_physical_memory_read(comp_addr, svb_comp, comp_len); + + svb_sig = g_malloc0(sig_len); + cpu_physical_memory_read(sig_addr, svb_sig, sig_len); + + rc = DIAG_508_RC_FAIL_VERIF; + /* + * It is uncertain which certificate contains + * the analogous key to verify the signed data + */ + for (int i = 0; i < qcs->count; i++) { + verified = diag_508_verify_sig(qcs->certs[i].raw, + qcs->certs[i].size, + svb_comp, comp_len, + svb_sig, sig_len); + if (verified == 0) { + svb->csi.idx = i; + svb->csi.len = cpu_to_be64(qcs->certs[i].der_size); + cpu_physical_memory_write(addr, &svb->csi, be32_to_cpu(csi_size)); + rc = DIAG_508_RC_OK; + break; + } + } + + return rc; +} + +QEMU_BUILD_BUG_MSG(sizeof(Diag508SignatureVerificationBlock) != 48, + "size of Diag508SignatureVerificationBlock is wrong"); + void handle_diag_508(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) { + S390IPLCertificateStore *qcs = s390_ipl_get_certificate_store(); uint64_t subcode = env->regs[r3]; + uint64_t addr = env->regs[r1]; int rc; if (env->psw.mask & PSW_MASK_PSTATE) { @@ -535,7 +633,19 @@ void handle_diag_508(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) switch (subcode) { case DIAG_508_SUBC_QUERY_SUBC: - rc = 0; + rc = DIAG_508_SUBC_SIG_VERIF; + break; + case DIAG_508_SUBC_SIG_VERIF: + size_t csi_size = sizeof(Diag508CertificateStoreInfo); + size_t svb_size = sizeof(Diag508SignatureVerificationBlock); + + if (!diag_parm_addr_valid(addr, svb_size, false) || + !diag_parm_addr_valid(addr, csi_size, true)) { + s390_program_interrupt(env, PGM_ADDRESSING, ra); + return; + } + + rc = handle_diag508_sig_verif(addr, csi_size, svb_size, qcs); break; default: s390_program_interrupt(env, PGM_SPECIFICATION, ra); -- 2.49.0