Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196099/?format=api
{ "id": 2196099, "url": "http://patchwork.ozlabs.org/api/patches/2196099/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212204352.1044699-13-zycai@linux.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260212204352.1044699-13-zycai@linux.ibm.com>", "list_archive_url": null, "date": "2026-02-12T20:43:33", "name": "[v8,12/30] s390x/diag: Implement DIAG 508 subcode 1 for signature verification", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c24b787ac42d182ea1d5546f0a2d5665709dc4a0", "submitter": { "id": 90643, "url": "http://patchwork.ozlabs.org/api/people/90643/?format=api", "name": "Zhuoying Cai", "email": "zycai@linux.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212204352.1044699-13-zycai@linux.ibm.com/mbox/", "series": [ { "id": 492021, "url": "http://patchwork.ozlabs.org/api/series/492021/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=492021", "date": "2026-02-12T20:43:36", "name": "Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices", "version": 8, "mbox": "http://patchwork.ozlabs.org/series/492021/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196099/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196099/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=s9DPERlv;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fBnSX69jSz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 13 Feb 2026 07:48:12 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vqdY5-0000lB-4j; Thu, 12 Feb 2026 15:44:29 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <zycai@linux.ibm.com>)\n id 1vqdY3-0000kD-Cc; Thu, 12 Feb 2026 15:44:27 -0500", "from mx0a-001b2d01.pphosted.com ([148.163.156.1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <zycai@linux.ibm.com>)\n id 1vqdY1-0007bp-Bw; Thu, 12 Feb 2026 15:44:27 -0500", "from pps.filterd (m0356517.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 61CJt1dP451836; Thu, 12 Feb 2026 20:44:21 GMT", "from ppma13.dal12v.mail.ibm.com\n (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4c696ur4cg-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 12 Feb 2026 20:44:21 +0000 (GMT)", "from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1])\n by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 61CHR6mm019251;\n Thu, 12 Feb 2026 20:44:20 GMT", "from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72])\n by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4c6hxkbyvk-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 12 Feb 2026 20:44:20 +0000", "from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com\n [10.39.53.233])\n by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 61CKiIjS34472590\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 12 Feb 2026 20:44:18 GMT", "from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 7B4BB5804E;\n Thu, 12 Feb 2026 20:44:18 +0000 (GMT)", "from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id BEA8958054;\n Thu, 12 Feb 2026 20:44:16 +0000 (GMT)", "from fedora-workstation.ibmuc.com (unknown [9.61.112.15])\n by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP;\n Thu, 12 Feb 2026 20:44:16 +0000 (GMT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=nl920cuPg4zGIAaok\n aqocWlvovAaKuAH8vGDN2UyddA=; b=s9DPERlvacJgoUur1d8Zzo1rxRxCL0ZeP\n 2Vco5gzOP6AQy5uwg0sng08ZOz4AamHHrKJwn9Bu0KDNht99MQUdUIX+JnHgomnQ\n TpreiJo/ydwSKqNUTOdWDEJpUUW8Jq4CiXHGI7Lym7yNm9Uzsdz7gF256Z2w3i4x\n T4BGtxhS1O5O8kOyaNz/8vOlebNenrAxZAvLa62QAzeEMu3/4c3oN6R/IBPY2wFr\n Ov5+gXr6ZSx21jM+X3dgW3vVlS+KkMUQLxn7Vawb7ff2RFmqrDJk6h5TNPYsYIq2\n C9kUUG0ucxeM2U82piPqn//8r9Alz6tZjmrj0J2ZCje7qAhgyGscw==", "From": "Zhuoying Cai <zycai@linux.ibm.com>", "To": "thuth@redhat.com, berrange@redhat.com, richard.henderson@linaro.org,\n jrossi@linux.ibm.com, qemu-s390x@nongnu.org, qemu-devel@nongnu.org", "Cc": "david@kernel.org, walling@linux.ibm.com, jjherne@linux.ibm.com,\n pasic@linux.ibm.com, borntraeger@linux.ibm.com, farman@linux.ibm.com,\n mjrosato@linux.ibm.com, iii@linux.ibm.com, eblake@redhat.com,\n armbru@redhat.com, zycai@linux.ibm.com, alifm@linux.ibm.com,\n brueckner@linux.ibm.com", "Subject": "[PATCH v8 12/30] s390x/diag: Implement DIAG 508 subcode 1 for\n signature verification", "Date": "Thu, 12 Feb 2026 15:43:33 -0500", "Message-ID": "<20260212204352.1044699-13-zycai@linux.ibm.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260212204352.1044699-1-zycai@linux.ibm.com>", "References": "<20260212204352.1044699-1-zycai@linux.ibm.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-TM-AS-GCONF": "00", "X-Authority-Analysis": "v=2.4 cv=YZiwJgRf c=1 sm=1 tr=0 ts=698e3ba5 cx=c_pps\n a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17\n a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=Mpw57Om8IfrbqaoTuvik:22\n a=GgsMoib0sEa3-_RKJdDe:22 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8\n a=K66z3tz1c1WH2lCF3KIA:9", "X-Proofpoint-ORIG-GUID": "W6hALzyyD3votdUA-p9HwPYXx-dSC6kb", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwMjEyMDE1NyBTYWx0ZWRfX0qN6RBfWUowy\n 1+057p8L2jFVUiUb+5lWZ37IDyiWhiul+/Vh+YdMtstazc5i9j2HmNDM07ipFqisuzguPvF7NdT\n mmDpbC5rx731/U/ZW4voc7lDvpBvjw3kRvo2KmM1mToB72cBU7e3fMKHMAJqOe4EVfPVwoE0Y72\n ytD2CorcPzMg2L7Cmboe5iCLkU+00dhaFCjaaQ0Jsbg7eppsKa2ocrTRgZVHl2TFoZ9UaaqRqUh\n 3rU6VDqL34Lm35G+IizgQQrxC4HKOq38rQQ7hnxuatm3VB5lf4iDw+CwFMlhxFcIQXAx0qb7SeF\n iJmPj5gaK2DDWTxEZ1aLIXERUzbWY9fwETejr+UgmXfinAkYnHHcCnPLAuJGRNFkSzdnlteCHZT\n 022li5IgEege/EhnbIMEAY/5lvEd8oXEHOvirI9l9wXCsNcbBvJR0TrclKM1kyk0AfGnn2PY6Mz\n lEb2y/h11rM/S/lXI6w==", "X-Proofpoint-GUID": "W6hALzyyD3votdUA-p9HwPYXx-dSC6kb", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-02-12_05,2026-02-12_03,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n priorityscore=1501 spamscore=0 impostorscore=0 suspectscore=0 malwarescore=0\n phishscore=0 bulkscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602120157", "Received-SPF": "pass client-ip=148.163.156.1; envelope-from=zycai@linux.ibm.com;\n helo=mx0a-001b2d01.pphosted.com", "X-Spam_score_int": "-19", "X-Spam_score": "-2.0", "X-Spam_bar": "--", "X-Spam_report": "(-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001,\n RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n 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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Collin Walling <walling@linux.ibm.com>\n\nDIAG 508 subcode 1 performs signature-verification on signed components.\nA signed component may be a Linux kernel image, or any other signed\nbinary. **Verification of initrd is not supported.**\n\nThe instruction call expects two item-pairs: an address of a device\ncomponent, an address of the analogous signature file (in PKCS#7 DER format),\nand their respective lengths. All of this data should be encapsulated\nwithin a Diag508SigVerifBlock.\n\nThe DIAG handler will read from the provided addresses\nto retrieve the necessary data, parse the signature file, then\nperform the signature-verification. Because there is no way to\ncorrelate a specific certificate to a component, each certificate\nin the store is tried until either verification succeeds, or all\ncerts have been exhausted.\n\nA return code of 1 indicates success, and the index and length of the\ncorresponding certificate will be set in the Diag508SigVerifBlock.\nThe following values indicate failure:\n\n\t0x0102: no certificates are available in the store\n\t0x0202: component data is invalid\n\t0x0302: PKCS#7 format signature is invalid\n\t0x0402: signature-verification failed\n\t0x0502: length of Diag508SigVerifBlock is invalid\n\nSigned-off-by: Collin Walling <walling@linux.ibm.com>\nSigned-off-by: Zhuoying Cai <zycai@linux.ibm.com>\nReviewed-by: Thomas Huth <thuth@redhat.com>\n---\n docs/specs/s390x-secure-ipl.rst | 17 +++++\n include/hw/s390x/ipl/diag508.h | 30 +++++++++\n target/s390x/diag.c | 111 +++++++++++++++++++++++++++++++-\n 3 files changed, 157 insertions(+), 1 deletion(-)", "diff": "diff --git a/docs/specs/s390x-secure-ipl.rst b/docs/specs/s390x-secure-ipl.rst\nindex 867d92fa68..6e5a86fcf4 100644\n--- a/docs/specs/s390x-secure-ipl.rst\n+++ b/docs/specs/s390x-secure-ipl.rst\n@@ -78,3 +78,20 @@ that requires assistance from QEMU.\n \n Subcode 0 - query installed subcodes\n Returns a 64-bit mask indicating which subcodes are supported.\n+\n+Subcode 1 - perform signature verification\n+ Perform signature-verification on a signed component, using certificates\n+ from the certificate store and leveraging qcrypto libraries to perform\n+ this operation.\n+\n+ Note: verification of initrd is not supported.\n+\n+ A return code of 1 indicates success, and the index and length of the\n+ corresponding certificate will be set in the Diag508SigVerifBlock.\n+ The following values indicate failure:\n+\n+ * ``0x0102``: no certificates are available in the store\n+ * ``0x0202``: component data is invalid\n+ * ``0x0302``: PKCS#7 format signature is invalid\n+ * ``0x0402``: signature-verification failed\n+ * ``0x0502``: length of Diag508SigVerifBlock is invalid\ndiff --git a/include/hw/s390x/ipl/diag508.h b/include/hw/s390x/ipl/diag508.h\nindex 6281ad8299..8a147f32a0 100644\n--- a/include/hw/s390x/ipl/diag508.h\n+++ b/include/hw/s390x/ipl/diag508.h\n@@ -11,5 +11,35 @@\n #define S390X_DIAG508_H\n \n #define DIAG_508_SUBC_QUERY_SUBC 0x0000\n+#define DIAG_508_SUBC_SIG_VERIF 0x8000\n+\n+#define DIAG_508_RC_OK 0x0001\n+#define DIAG_508_RC_NO_CERTS 0x0102\n+#define DIAG_508_RC_INVAL_COMP_DATA 0x0202\n+#define DIAG_508_RC_INVAL_PKCS7_SIG 0x0302\n+#define DIAG_508_RC_FAIL_VERIF 0x0402\n+#define DIAG_508_RC_INVAL_LEN 0x0502\n+\n+/*\n+ * Maximum componenet and signature sizes for current secure boot implementation\n+ * Not architecturally defined and may need to revisit if increased\n+ */\n+#define DIAG_508_MAX_COMP_LEN 0x10000000\n+#define DIAG_508_MAX_SIG_LEN 4096\n+\n+struct Diag508SigVerifBlock {\n+ uint32_t length;\n+ uint8_t reserved0[3];\n+ uint8_t version;\n+ uint32_t reserved[2];\n+ uint8_t cert_store_index;\n+ uint8_t reserved1[7];\n+ uint64_t cert_len;\n+ uint64_t comp_len;\n+ uint64_t comp_addr;\n+ uint64_t sig_len;\n+ uint64_t sig_addr;\n+};\n+typedef struct Diag508SigVerifBlock Diag508SigVerifBlock;\n \n #endif\ndiff --git a/target/s390x/diag.c b/target/s390x/diag.c\nindex 0b56023bb8..1ec98c8e08 100644\n--- a/target/s390x/diag.c\n+++ b/target/s390x/diag.c\n@@ -626,9 +626,110 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n }\n }\n \n+static bool diag_508_verify_sig(uint8_t *cert, size_t cert_size,\n+ uint8_t *comp, size_t comp_size,\n+ uint8_t *sig, size_t sig_size)\n+{\n+ g_autofree uint8_t *sig_pem = NULL;\n+ size_t sig_size_pem;\n+ int rc;\n+\n+ /*\n+ * PKCS#7 signature with DER format\n+ * Convert to PEM format for signature verification\n+ *\n+ * Ignore errors during qcrypto signature format conversion and verification\n+ * Return false on any error, treating it as a verification failure\n+ */\n+ rc = qcrypto_pkcs7_convert_sig_pem(sig, sig_size, &sig_pem, &sig_size_pem, NULL);\n+ if (rc < 0) {\n+ return false;\n+ }\n+\n+ rc = qcrypto_x509_verify_sig(cert, cert_size,\n+ comp, comp_size,\n+ sig_pem, sig_size_pem, NULL);\n+ if (rc < 0) {\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\n+static int handle_diag508_sig_verif(uint64_t addr)\n+{\n+ int verified;\n+ uint32_t svb_len;\n+ uint64_t comp_len, comp_addr;\n+ uint64_t sig_len, sig_addr;\n+ g_autofree uint8_t *comp = NULL;\n+ g_autofree uint8_t *sig = NULL;\n+ g_autofree Diag508SigVerifBlock *svb = NULL;\n+ size_t svb_size = sizeof(Diag508SigVerifBlock);\n+ S390IPLCertificateStore *cs = s390_ipl_get_certificate_store();\n+\n+ if (!cs->count) {\n+ return DIAG_508_RC_NO_CERTS;\n+ }\n+\n+ svb = g_new0(Diag508SigVerifBlock, 1);\n+ cpu_physical_memory_read(addr, svb, svb_size);\n+\n+ svb_len = be32_to_cpu(svb->length);\n+ if (svb_len != svb_size) {\n+ return DIAG_508_RC_INVAL_LEN;\n+ }\n+\n+ comp_len = be64_to_cpu(svb->comp_len);\n+ comp_addr = be64_to_cpu(svb->comp_addr);\n+ sig_len = be64_to_cpu(svb->sig_len);\n+ sig_addr = be64_to_cpu(svb->sig_addr);\n+\n+ if (!comp_len || !comp_addr || comp_len > DIAG_508_MAX_COMP_LEN) {\n+ if (comp_len > DIAG_508_MAX_COMP_LEN) {\n+ warn_report(\"DIAG 0x508: component length %lu exceeds current maximum %u\",\n+ comp_len, DIAG_508_MAX_COMP_LEN);\n+ }\n+ return DIAG_508_RC_INVAL_COMP_DATA;\n+ }\n+\n+ if (!sig_len || !sig_addr || sig_len > DIAG_508_MAX_SIG_LEN) {\n+ if (sig_len > DIAG_508_MAX_SIG_LEN) {\n+ warn_report(\"DIAG 0x508: signature length %lu exceeds current maximum %u\",\n+ sig_len, DIAG_508_MAX_SIG_LEN);\n+ }\n+ return DIAG_508_RC_INVAL_PKCS7_SIG;\n+ }\n+\n+ comp = g_malloc0(comp_len);\n+ cpu_physical_memory_read(comp_addr, comp, comp_len);\n+\n+ sig = g_malloc0(sig_len);\n+ cpu_physical_memory_read(sig_addr, sig, sig_len);\n+\n+ for (int i = 0; i < cs->count; i++) {\n+ verified = diag_508_verify_sig(cs->certs[i].raw,\n+ cs->certs[i].size,\n+ comp, comp_len,\n+ sig, sig_len);\n+ if (verified) {\n+ svb->cert_store_index = i;\n+ svb->cert_len = cpu_to_be64(cs->certs[i].der_size);\n+ cpu_physical_memory_write(addr, svb, svb_size);\n+ return DIAG_508_RC_OK;\n+ }\n+ }\n+\n+ return DIAG_508_RC_FAIL_VERIF;\n+}\n+\n+QEMU_BUILD_BUG_MSG(sizeof(Diag508SigVerifBlock) != 64,\n+ \"size of Diag508SigVerifBlock is wrong\");\n+\n void handle_diag_508(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n {\n uint64_t subcode = env->regs[r3];\n+ uint64_t addr = env->regs[r1];\n int rc;\n \n if (env->psw.mask & PSW_MASK_PSTATE) {\n@@ -643,7 +744,15 @@ void handle_diag_508(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n \n switch (subcode) {\n case DIAG_508_SUBC_QUERY_SUBC:\n- rc = 0;\n+ rc = DIAG_508_SUBC_SIG_VERIF;\n+ break;\n+ case DIAG_508_SUBC_SIG_VERIF:\n+ if (!diag_parm_addr_valid(addr, sizeof(Diag508SigVerifBlock), true)) {\n+ s390_program_interrupt(env, PGM_ADDRESSING, ra);\n+ return;\n+ }\n+\n+ rc = handle_diag508_sig_verif(addr);\n break;\n default:\n s390_program_interrupt(env, PGM_SPECIFICATION, ra);\n", "prefixes": [ "v8", "12/30" ] }