From patchwork Tue Sep 29 13:12:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakub Szczudlo (Nokia)" X-Patchwork-Id: 99584 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06DCDCA5FA1 for ; Tue, 29 Sep 2026 13:12:27 +0000 (UTC) Received: from OSPPR02CU001.outbound.protection.outlook.com (OSPPR02CU001.outbound.protection.outlook.com [40.107.159.50]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7494.1790687538280525780 for ; Tue, 29 Sep 2026 06:12:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=FHnEGuI3; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.159.50, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HOWvpAo218RIydfLwtb5N12UZ88dVbKAQIABlvdSiuZqd8QkAm9clYOvmrNobu2kGSsZ7BfbZjRy55ZN3n4kEIGPKCfd2Gcs9PBlOLuz3hpmHhzTN+Eg101kK9x+O3KVssC+spZgDgX7XX7dWdmp70pQoxuD8O+oClS1iw0oMvJjSaviV43yrEVLbRY2Hfh1w8Mwu2cu3O3HRT8RBG0v4js3bRr5m/6DMWasdOeDhX2kUPA5/aGtqVj9KS5rove+5O0U5sdCAU8f1m0/WeDcMDtiEg7YQXGmKhYabAVJIHzU6uS6r9c3PNX4wB7X/RxjxXPl3ePfSxMNJteIn6Sd+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GdBPWrGvoG+P3/LmSZQR7JZ1f+5yZ1pBhc1+v64Ir80=; b=JMSPA/BQB9qUYnbd4QfDQKwVeQa9lzkRGmJ1TCBBhxdqPfp9peRy8b/1BG/bioBejgXpeC4RVsGaTvIp18YOyXFg1zLn72ZmvRIx3d8Hmchm0o3gDJJMjn6TpNpqCynav1ZXeCk2fLDcedM/AOMJxsR8Qjbdy/TwMTHjrB5TJgDK+hVldw/ES/Qx1mHrI7Gqq5WCizZ2TK2c7u4xvCDqeYvhjAvf8BbT1GBQ2vlNKf8J4pSC72gytoPvo7O9X9Z9KAeYtSdpPXQSwiXUeP2zbBGoK6VxAvOiRHzsdZxYN8i20ZKLE4RXCgqKTSvdX91mIaQB8rUqFuiFgGPgjf0YqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GdBPWrGvoG+P3/LmSZQR7JZ1f+5yZ1pBhc1+v64Ir80=; b=FHnEGuI3n6ObhUzTf32a5RaP78NwmcgVnRNwafHlafpVd0ka3y2I7uIgT5ybjeF2pTKZv+FgTmexeQsnN4FicX/mrLX/uvvgpK2/YflbzWphIpv3gHik8A0AaIniA4jIhocHx1GoWo/22D6QNUsfxMpDV0gzmR5T2fj5IYbdIa2ACYYM77/kaL73XZyV+1RUWqFHHy2RZNPbT6XYpwElS8Z7fIuqLP88cJek4JgezkSHSlS9azAXzc13L+spnK/lyJaHP6qoSQsyQ7fj3VO4MFGHmtfhGERIrK7w0nOAD4KwEzcKbUXk/h8Y6twfQ99zXwcn3WGg4OODHaoQELjEbg== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:12:14 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:12:14 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2 1/5] gnutls: fix CVE-2026-42012 Thread-Topic: [scarthgap][PATCH v2 1/5] gnutls: fix CVE-2026-42012 Thread-Index: AQHdUBQkxJ6UpKvuLki4y+V8iW4yew== Date: Tue, 29 Sep 2026 13:12:14 +0000 Message-ID: <20260929131131.246533-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 124bedd0-cd87-4d70-244f-08df1e2b4774 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|6133799003|10067099003|11063799006|5023799004|56012099006|3023799007|12006099003|13003099007|18002099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: 0utvORVMPXXgdWdIpiMgXHY6qrJ7OClucDrhiM4baEcYuyDLRBG9mtXZhcD2t15XM21jo7lZ0tpKJ4K3RDm6davQQoqz2K+ehDieYG03EnzwyBeyEYhe3MpqPSBUeTybyfsYNERxUG6pZn7lyfekuMzwb1GoWuzFwwUEYPIgwycgVmr1zrZABp3SqkY1CDlMXQMsrd5/FCvh0CQHDo/eY4MnfARpiMxSLbL+bCH3E4RoGxvag/CDvDzb9kdsHgyggDeD99GQ5mc+3j1oGwHWQ5YXmaN/zGmo1RwWZE+kuz7uu6wj5lZH9GfgjPiDYFsc9KuMs5zNMwzLmczpsPTuh3ESs1ozqqBD4fjAc4Eq9onlpFhJ3ZJ2wessyEnVxPjValFW6j9Owfmr+ZysTLfBPavYAdxi8ixj3aYt/zjZWjewkSmbdkFl1To+lynFlJPQv9uddYg6h55WVFlj2GW8Zjw69CsCVRw2ZI0vmwMdRxtrRGEa3mKnJJupReS0vFKc9gurXcd3KLP29Slf3Ir2d5Tm/6hi+NvKf3j7hg4UdaNWgJARVOK8o9FrnqOkJeVBESE6iZ5VWuOT9UFsG1XxUqpfjYn52ekEvzby802QKHddAjb5oBNQh0z8lNuPm4DZuXFsTdGGTg7bloHzfrz0XhGVhkNQ8AJNu1FAv4CDv5g= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(6133799003)(10067099003)(11063799006)(5023799004)(56012099006)(3023799007)(12006099003)(13003099007)(18002099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?YwXkEv/Zyu3YsgozRfNLnYFWxX87?= =?utf-8?q?i3Z21LtnIWK1mswHM62Z7fSBUsNRJf5XYMt2ONRhccoR9FcvMYJA8W4UqzmmlXjOi?= =?utf-8?q?FKO9n3FF6Srv7esHIdSlGuIxfSbzjnYAg2g4H0onHgRCeyu2IOsTrcTNKUa+DJ3fw?= =?utf-8?q?ePY1HTJJGd/DHNp5moAqBkdUTkI39Ph5R+31NVyQeOhYaxPUNrmwZZtVDqJizDdS8?= =?utf-8?q?koNF9nNHYkmQ1dtQZjxQET3M/8GjEqIqvlQiIAGveANi7toywqs+I02mQ5QyqowMp?= =?utf-8?q?ztUbOGzQCe/hwMcNV4evI/5MgF/QR7jv0yx6vgMT+Ag4YmxY/7QR/VLaJ+s0GGiYs?= =?utf-8?q?b0KWyjaoc570QI5JjPdASWBCVS8SQmz1bPNXCdyi9NftsOujQ61ow4ZG79/hX+jX0?= =?utf-8?q?EgsUijyg8faudUGhCZZ4su6mnBV9SLqczdCopaFyOliKlxyhzX/9AIOs/dA6HGqaw?= =?utf-8?q?5M2M3VDctzMpHeiZiyExaYSpDS1wur9ZXiX3lAhxlUYbI0PqjW9p3SQB/Gb6ERJFc?= =?utf-8?q?g26q+xCL+AR4p2qm2A807TqKWUwncQ8k+c2i0TEzusDE2zJau7gdCasXzTQGggiUp?= =?utf-8?q?jAOG4V6DU9SMTh0kKC4ZetUzaarviS/OSS29vARh8w+ywf/PMSjkdB+V3suMs2wyw?= =?utf-8?q?sUi/4ler4b2foOhWlHRryMsJIJ50pQnsBcO3R2l3g6PcPmtsNw+9P/mKMbnnqdBwN?= =?utf-8?q?+xHfDGD5XZsuQ/3sxVNeA8KDd4eyhlVvqYm7yAh7F0uqRUtTgkjuHa2+u8t9+jBrO?= =?utf-8?q?68ZLgvkvVpOl0U8oY0KE1Ot64Yhzdyo5VvZ+P2emAge82udXX3QD9o3objYaQITXH?= =?utf-8?q?hn8hcUBMs38H6V++emV5TwH7ri4C2+e/ZI6GFKyC1oXacT8IZPdR/dr4ByH7s3CkZ?= =?utf-8?q?1n7S+twTG5mxx4Yo/qAAuAc2jQlraO41imk5BokSiOpiI4L79fLELkL9EZbKWsZtV?= =?utf-8?q?hkT3aMOft98bkOO9LZMz9kmBm5RbxfmvLoLdUMbvEnrRgTKyrPnuUAnKsRIH2Wgnn?= =?utf-8?q?8Sv+xdZtsvqikFDjnVY1yAVztr1OCMKEELLX3c9TVvHerfgEWT8R9BLNU8PLpgOcm?= =?utf-8?q?jTDE3bq0l30+tbQVoZm13jUOsCW5tZEW0VT35UtlY2ZztvhGaj4EHWtGfnVhhsiwM?= =?utf-8?q?FJ1hi8mqpi91IvsBMdjVNbnxXEzD6FyrlARfLpQ9JKRS6EZn1QZQ5rt14qFFZgw4C?= =?utf-8?q?qFZVYKzYAdl3efyRz4ax9EYUNNlWeFazX0VNQnVGa2cGNruymNG4LbYWUvX5UCCJH?= =?utf-8?q?aC34wbYN3RtUsIxa5Vi0V5Hc4gGHw8zaDub9Hs+hbWUx0PHsRE7fEMLmyOhYSHUW7?= =?utf-8?q?HK+y3do1tsqnybvmhGgHYaYNrRkOx28bcVF131MB8VQ5Fq00gW3/US6as5g4eT445?= =?utf-8?q?pVIMMQrCBB56RH0l9xzX7p7g1gZ7owRsaYg+yARjJP/4SvozITex0L1oKT5OtWUR2?= =?utf-8?q?vyyZWUOz16khPvPhuTPTd7XPqRYqSMiW8z37y1x8NxHJ8n4kO+sYzxrAEAIQhrPuI?= =?utf-8?q?znbKtVLZTywd81w7koiAcr7rkprKpjIUWP4XijxmuVClsiA3clC2yeZLDi2sfqeXs?= =?utf-8?q?gvJXlDXNn0yVBpY1jI+OK0IactgnZz4YkoAbvIKjaUc2l/C1BtKlRrJICYrULJfpt?= =?utf-8?q?xR8I908sB8t51/bEtOPTuho9ib00UaUQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV2PR07MB11919.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 124bedd0-cd87-4d70-244f-08df1e2b4774 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:12:14.0547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5hwdUBs/vy/I25qMWiFur+j+fo6wjcptZyUkxCkIyuYiuZLyq5dZCsQYcSi3gmBAELf8cOyEbmGviKgF1KoWj/Mgemlmszh4oWV2epVzKsQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:12:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246863 Backport patch to fix CVE-2026-42012. References: https://nvd.nist.gov/vuln/detail/CVE-2026-42012 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/8dcc6a1f48945997666ac9f10896819edd01a03b Tested with ptest Pre patches taken from upstream so CVE fix will land cleanly Signed-off-by: Jakub Szczudlo --- - delete unnedded lines from patches - correct patches to have also diff lines - document backport changes in CVE-2026-42012-pre2.patch .../gnutls/gnutls/CVE-2026-42012-pre1.patch | 69 ++++++++ .../gnutls/gnutls/CVE-2026-42012-pre2.patch | 162 ++++++++++++++++++ .../gnutls/gnutls/CVE-2026-42012-pre3.patch | 129 ++++++++++++++ .../gnutls/gnutls/CVE-2026-42012.patch | 48 ++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 4 + 5 files changed, 412 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre3.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42012.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch new file mode 100644 index 0000000000..9b2a5d16ca --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch @@ -0,0 +1,69 @@ +From 6133fb459b74a9dcfa2d0ff010a4e03c56822d39 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Fri, 13 Mar 2026 17:00:03 +0100 +Subject: [PATCH] x509/hostname-verify: refactor and simplify CN fallback logic + +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42012 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/6133fb459b74a9dcfa2d0ff010a4e03c56822d39] + +Signed-off-by: Jakub Szczudlo +--- + lib/x509/hostname-verify.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/lib/x509/hostname-verify.c b/lib/x509/hostname-verify.c +--- a/lib/x509/hostname-verify.c ++++ b/lib/x509/hostname-verify.c +@@ -108,7 +108,7 @@ unsigned gnutls_x509_crt_check_ip(gnutls + * that we do not fallback to CN-ID if we encounter a supported name + * type. + */ +-#define IS_SAN_SUPPORTED(san) \ ++#define PRECLUDES_CN_FALLBACK(san) \ + (san == GNUTLS_SAN_DNSNAME || san == GNUTLS_SAN_IPADDRESS) + + /** +@@ -151,13 +151,12 @@ unsigned gnutls_x509_crt_check_hostname2 + { + char dnsname[MAX_CN]; + size_t dnsnamesize; +- int found_dnsname = 0; + int ret = 0; + int i = 0; + struct in_addr ipv4; + char *p = NULL; + char *a_hostname; +- unsigned have_other_addresses = 0; ++ bool cn_fallback_allowed = true; + gnutls_datum_t out; + + /* check whether @hostname is an ip address */ +@@ -213,9 +212,10 @@ hostname_fallback: + ret = gnutls_x509_crt_get_subject_alt_name(cert, i, dnsname, + &dnsnamesize, NULL); + +- if (ret == GNUTLS_SAN_DNSNAME) { +- found_dnsname = 1; ++ if (PRECLUDES_CN_FALLBACK(ret)) ++ cn_fallback_allowed = false; + ++ if (ret == GNUTLS_SAN_DNSNAME) { + if (memchr(dnsname, '\0', dnsnamesize)) { + _gnutls_debug_log( + "certificate has %s with embedded null in name\n", +@@ -236,13 +236,10 @@ hostname_fallback: + ret = 1; + goto cleanup; + } +- } else { +- if (IS_SAN_SUPPORTED(ret)) +- have_other_addresses = 1; + } + } + +- if (!have_other_addresses && !found_dnsname && ++ if (cn_fallback_allowed && + _gnutls_check_key_purpose(cert, GNUTLS_KP_TLS_WWW_SERVER, 0) != 0) { + /* did not get the necessary extension, use CN instead, if the + * certificate would have been acceptable for a TLS WWW server purpose. diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch new file mode 100644 index 0000000000..07a5f0127f --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch @@ -0,0 +1,162 @@ +From 5cc003b9688378f6c7934b1df0aa147e80006be4 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Fri, 13 Mar 2026 17:41:33 +0100 +Subject: [PATCH] x509: add bare-bones awareness of SRV virtual SAN + +There's no support for constraints, no certtool support, no nothing. +Just added what's easy to add because I needed a virtual SAN for them. + +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42012 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/5cc003b9688378f6c7934b1df0aa147e80006be4] + +Backport Changes: +- common.h context updated for 3.8.4 (PKIX1_RSA_OAEP_P_SPECIFIED_OID). +- virt-san.c: use _gnutls_steal_datum instead of upstream _gnutls_take_datum + (steal_datum comes from CVE-2026-42012-pre3). + +Signed-off-by: Jakub Szczudlo +--- + lib/includes/gnutls/gnutls.h.in | 4 +++- + lib/x509/common.h | 1 + + lib/x509/name_constraints.c | 3 ++- + lib/x509/output.c | 6 ++++++ + lib/x509/virt-san.c | 23 +++++++++++++++++++++++ + lib/x509/x509.c | 3 ++- + 6 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -2646,6 +2646,7 @@ void gnutls_psk_set_server_params_functi + * @GNUTLS_SAN_OTHERNAME_XMPP: Virtual SAN, used by certain functions for convenience. + * @GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL: Virtual SAN, used by certain functions for convenience. + * @GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL: Virtual SAN, used by certain functions for convenience. ++ * @GNUTLS_SAN_OTHERNAME_SRV: Virtual SAN, used by certain functions for convenience. + * + * Enumeration of different subject alternative names types. + */ +@@ -2663,7 +2664,8 @@ typedef enum gnutls_x509_subject_alt_nam + Used by gnutls_x509_crt_get_subject_alt_othername_oid. */ + GNUTLS_SAN_OTHERNAME_XMPP = 1000, + GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL, +- GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL ++ GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL, ++ GNUTLS_SAN_OTHERNAME_SRV + } gnutls_x509_subject_alt_name_t; + + struct gnutls_openpgp_crt_int; +diff --git a/lib/x509/common.h b/lib/x509/common.h +--- a/lib/x509/common.h ++++ b/lib/x509/common.h +@@ -107,6 +107,7 @@ + #define XMPP_OID "1.3.6.1.5.5.7.8.5" + #define KRB5_PRINCIPAL_OID "1.3.6.1.5.2.2" + #define MSUSER_PRINCIPAL_NAME_OID "1.3.6.1.4.1.311.20.2.3" ++#define SRV_OID "1.3.6.1.5.5.7.8.7" + #define PKIX1_RSA_PSS_MGF1_OID "1.2.840.113549.1.1.8" + #define PKIX1_RSA_OAEP_P_SPECIFIED_OID "1.9" + +diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c +--- a/lib/x509/name_constraints.c ++++ b/lib/x509/name_constraints.c +@@ -516,7 +516,8 @@ static int validate_name_constraints_nod + if (type != GNUTLS_SAN_DNSNAME && type != GNUTLS_SAN_RFC822NAME && + type != GNUTLS_SAN_DN && type != GNUTLS_SAN_URI && + type != GNUTLS_SAN_IPADDRESS && +- type != GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL) { ++ type != GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL && ++ type != GNUTLS_SAN_OTHERNAME_SRV) { + return gnutls_assert_val(GNUTLS_E_X509_UNKNOWN_SAN); + } + +diff --git a/lib/x509/output.c b/lib/x509/output.c +--- a/lib/x509/output.c ++++ b/lib/x509/output.c +@@ -121,6 +121,7 @@ static void print_name(gnutls_buffer_st + if ((type == GNUTLS_SAN_DNSNAME || type == GNUTLS_SAN_OTHERNAME_XMPP || + type == GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL || + type == GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL || ++ type == GNUTLS_SAN_OTHERNAME_SRV || + type == GNUTLS_SAN_RFC822NAME || type == GNUTLS_SAN_URI) && + sname != NULL && strlen(sname) != name->size) { + adds(str, _("warning: SAN contains an embedded NUL, " +@@ -180,6 +181,11 @@ static void print_name(gnutls_buffer_st + name->size, NON_NULL(name->data)); + break; + ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ addf(str, _("%sSRVName: %.*s\n"), prefix, name->size, ++ NON_NULL(name->data)); ++ break; ++ + default: + addf(str, _("%sUnknown name: "), prefix); + _gnutls_buffer_hexprint(str, name->data, name->size); +diff --git a/lib/x509/virt-san.c b/lib/x509/virt-san.c +--- a/lib/x509/virt-san.c ++++ b/lib/x509/virt-san.c +@@ -45,6 +45,9 @@ static int san_othername_to_virtual(cons + memcmp(oid, MSUSER_PRINCIPAL_NAME_OID, + sizeof(MSUSER_PRINCIPAL_NAME_OID) - 1) == 0) + return GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL; ++ else if ((unsigned)size == (sizeof(SRV_OID) - 1) && ++ memcmp(oid, SRV_OID, sizeof(SRV_OID) - 1) == 0) ++ return GNUTLS_SAN_OTHERNAME_SRV; + } + + return GNUTLS_SAN_OTHERNAME; +@@ -59,6 +62,8 @@ static const char *virtual_to_othername_ + return KRB5_PRINCIPAL_OID; + case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL: + return MSUSER_PRINCIPAL_NAME_OID; ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ return SRV_OID; + default: + return NULL; + } +@@ -126,6 +131,15 @@ int _gnutls_alt_name_assign_virt_type(st + name->type = GNUTLS_SAN_OTHERNAME; + break; + ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ ret = _gnutls_x509_encode_string(ASN1_ETYPE_IA5_STRING, ++ san->data, san->size, ++ &encoded); ++ if (ret < 0) ++ return gnutls_assert_val(ret); ++ name->san = _gnutls_steal_datum(&encoded); ++ break; ++ + default: + return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); + } +@@ -187,6 +201,15 @@ int gnutls_x509_othername_to_virtual(con + othername->data, + othername->size, virt, 0); + if (ret < 0) { ++ gnutls_assert(); ++ return ret; ++ } ++ return 0; ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ ret = _gnutls_x509_decode_string(ASN1_ETYPE_IA5_STRING, ++ othername->data, ++ othername->size, virt, 0); ++ if (ret < 0) { + gnutls_assert(); + return ret; + } +diff --git a/lib/x509/x509.c b/lib/x509/x509.c +--- a/lib/x509/x509.c ++++ b/lib/x509/x509.c +@@ -1554,7 +1554,8 @@ inline static int is_type_printable(int + { + if (type == GNUTLS_SAN_DNSNAME || type == GNUTLS_SAN_RFC822NAME || + type == GNUTLS_SAN_URI || type == GNUTLS_SAN_OTHERNAME_XMPP || +- type == GNUTLS_SAN_OTHERNAME || type == GNUTLS_SAN_REGISTERED_ID) ++ type == GNUTLS_SAN_OTHERNAME_SRV || type == GNUTLS_SAN_OTHERNAME || ++ type == GNUTLS_SAN_REGISTERED_ID) + return 1; + else + return 0; diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre3.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre3.patch new file mode 100644 index 0000000000..7ed76d0366 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre3.patch @@ -0,0 +1,129 @@ +From 9f635788da50eb1285cae5c8d787b12bda01ae4d Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 22 Jan 2025 07:45:46 +0900 +Subject: [PATCH] datum, mem, str: add helper functions to steal pointers + +This introduces 3 new inline functions, namely _gnutls_steal_datum, +_gnutls_steal_buffer, and _gnutls_steal_pointer, to return a copy of +data structure and reset the original pointer. Those would enable to +return a populated data structure upon success; otherwise free the +partially filled data structure in a single code path, e.g., + +```c + gnutls_datum_t tmp_result = { NULL, 0 }; + + // Calculate tmp_result + ... + if (error) + goto cleanup; + + // Propagate tmp_result to *result + *result = _gnutls_steal_datum(&tmp_result); + +cleanup: + _gnutls_free_datum(&tmp_result); + return ret; +``` + +Signed-off-by: Daiki Ueno +CVE: CVE-2026-42012 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/9f635788da50eb1285cae5c8d787b12bda01ae4d] + +Signed-off-by: Jakub Szczudlo +--- + lib/datum.h | 11 +++++++++++ + lib/mem.h | 9 +++++++++ + lib/str.h | 23 +++++++++++++++-------- + 3 files changed, 35 insertions(+), 8 deletions(-) + +diff --git a/lib/datum.h b/lib/datum.h +--- a/lib/datum.h ++++ b/lib/datum.h +@@ -68,4 +68,15 @@ inline static ATTRIBUTE_NONNULL() void _ + dat->size = 0; + } + ++inline static ATTRIBUTE_NONNULL() gnutls_datum_t ++ _gnutls_steal_datum(gnutls_datum_t *src) ++{ ++ gnutls_datum_t dst = *src; ++ ++ src->data = NULL; ++ src->size = 0; ++ ++ return dst; ++} ++ + #endif /* GNUTLS_LIB_DATUM_H */ +diff --git a/lib/mem.h b/lib/mem.h +--- a/lib/mem.h ++++ b/lib/mem.h +@@ -33,6 +33,8 @@ + #include + #endif + ++#include "attribute.h" ++ + /* These realloc functions will return ptr if size==0, and will free + * the ptr if the new allocation failed. + */ +@@ -78,4 +80,11 @@ static inline void _gnutls_memory_mark_d + #endif + } + ++static inline ATTRIBUTE_NONNULL() void *_gnutls_steal_pointer(void **src) ++{ ++ void *dst = *src; ++ *src = NULL; ++ return dst; ++} ++ + #endif /* GNUTLS_LIB_MEM_H */ +diff --git a/lib/str.h b/lib/str.h +--- a/lib/str.h ++++ b/lib/str.h +@@ -30,6 +30,7 @@ + #include "datum.h" + #include + #include "errors.h" ++#include "attribute.h" + + #ifdef HAVE_DCGETTEXT + #include "gettext.h" +@@ -97,6 +98,19 @@ inline static void _gnutls_buffer_reset( + buf->length = 0; + } + ++inline static ATTRIBUTE_NONNULL() gnutls_buffer_st ++ _gnutls_steal_buffer(gnutls_buffer_st *src) ++{ ++ gnutls_buffer_st dst = *src; ++ ++ src->allocd = NULL; ++ src->data = NULL; ++ src->max_length = 0; ++ src->length = 0; ++ ++ return dst; ++} ++ + int _gnutls_buffer_resize(gnutls_buffer_st *, size_t new_size); + + int _gnutls_buffer_append_str(gnutls_buffer_st *, const char *str); +@@ -161,15 +175,8 @@ int _gnutls_buffer_append_escape(gnutls_ + size_t data_size, const char *invalid_chars); + int _gnutls_buffer_unescape(gnutls_buffer_st *dest); + +-#ifndef __attribute__ +-/* This feature is available in gcc versions 2.5 and later. */ +-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) +-#define __attribute__(Spec) /* empty */ +-#endif +-#endif +- + int _gnutls_buffer_append_printf(gnutls_buffer_st *dest, const char *fmt, ...) +- __attribute__((format(printf, 2, 3))); ++ ATTRIBUTE_FORMAT((printf, 2, 3)); + + void _gnutls_buffer_hexprint(gnutls_buffer_st *str, const void *data, + size_t len); diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42012.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012.patch new file mode 100644 index 0000000000..1f43efc122 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012.patch @@ -0,0 +1,48 @@ +From 8dcc6a1f48945997666ac9f10896819edd01a03b Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Fri, 13 Mar 2026 17:02:07 +0100 +Subject: [PATCH] x509/hostname-verify: make URI/SRV SAN preclude CN fallback + +URI/SRV SAN did not suppress CN fallback as required by RFC 6125 6.4.4: +> a client MUST NOT seek a match for a reference identifier of CN-ID +> if the presented identifiers include a DNS-ID, *SRV-ID*, *URI-ID*, +> or any application-specific identifier types supported by the client. + +With this change, certificates containing URI or SRV SAN +no longer pass DNS hostname checks via CN fallback +to avoid potential misuse of such certificates +beyond their original purpose. + +Reported-by: Oleh Konko +Fixes: #1802 +Fixes: CVE-2026-42012 +Fixes: GNUTLS-SA-2026-04-29-7 +CVSS: 6.5 Medium CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:H/A:N +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42012 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/8dcc6a1f48945997666ac9f10896819edd01a03b] + +Signed-off-by: Jakub Szczudlo +--- + lib/x509/hostname-verify.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/x509/hostname-verify.c b/lib/x509/hostname-verify.c +index e7597ad3b0..d989bb1abc 100644 +--- a/lib/x509/hostname-verify.c ++++ b/lib/x509/hostname-verify.c +@@ -108,8 +108,9 @@ unsigned gnutls_x509_crt_check_ip(gnutls_x509_crt_t cert, + * that we do not fallback to CN-ID if we encounter a supported name + * type. + */ +-#define PRECLUDES_CN_FALLBACK(san) \ +- (san == GNUTLS_SAN_DNSNAME || san == GNUTLS_SAN_IPADDRESS) ++#define PRECLUDES_CN_FALLBACK(san) \ ++ (san == GNUTLS_SAN_DNSNAME || san == GNUTLS_SAN_IPADDRESS || \ ++ san == GNUTLS_SAN_URI || san == GNUTLS_SAN_OTHERNAME_SRV) + + /** + * gnutls_x509_crt_check_hostname2: +-- +GitLab + diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index 641289be13..646cc350d9 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -52,6 +52,10 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-33846.patch \ file://CVE-2026-33845.patch \ file://CVE-2026-5419.patch \ + file://CVE-2026-42012-pre1.patch \ + file://CVE-2026-42012-pre2.patch \ + file://CVE-2026-42012-pre3.patch \ + file://CVE-2026-42012.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" From patchwork Tue Sep 29 13:12:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Jakub Szczudlo (Nokia)" X-Patchwork-Id: 99585 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7328CA5FA5 for ; Tue, 29 Sep 2026 13:12:46 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.24]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7504.1790687565911080143 for ; Tue, 29 Sep 2026 06:12:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=qephIP9B; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.130.24, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BPKfFbsI/qeAolL0qSBd5G7HfziPAfYgExY1DQBrtTaw6Nn9P8uSwGIvACaKP5xP/6dH4rquJeDx3Spu3/13tDCs6nAUt5j+wu7dnwomNAv/18ISKojre7gYrPb9b+gcfu7lwyTtvwLwjqz8HYyT1cFLvChGbYDHZBL6/NXzFpeU4tBzrfKn+jQRKQ93d7q3KzXKmA7N3wj/alvko4tvw6tec2/1L4ylK4V2M4WZNWqCMTgdjR2qQGA9+djG37QiqX0+MpeI1a5fgjyg1xo4p73I539bx2IE1pk4IlMIVrV5cV1Q/rWM3oz2PvZHVqVexI6Fkd0y8Ckr8DYG2pLwTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=faqxKQFm7QdNajwxwqzWabedvnPXQppHK+75DTeRoE8=; b=BjVEpQuhmS5IAxZyifk+kGCz/Ps2Uvu5JFHXk3fVtPX1GXu3j7dgTFCFIcA7QVDa62J1nGCgK0X6i4sGZm/BH0VE9jYvPI3EZ1PKLEGVr3ZW2xbhadq22dgxmI1tZpcs7EOZb0iAxF4lj3jVIj4gd2hS6fNSF6zv/vbJm9o00vyROK2aV4EWniYmuzSX0+qRqVzG1FX2Ydxi4fI2VWy6itDJAG41WVAkWVrDjnBMv8IW+DSyTlys7+q+iKQktiZ6ZVF+hM1HMn5dPfpg4MABsrDi3TCXI8phHA3/njNSETkmzZMlS64sSOPPvN87wHAhbzCdrC9xCIud8knlEJ1how== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=faqxKQFm7QdNajwxwqzWabedvnPXQppHK+75DTeRoE8=; b=qephIP9BZjiTRzVTaJuoNoOSrBsNLJ499AIseMDqzEK2094nLP+yRtIRmWTO0nRLvFDH4Wc7Ii1TqgfRIeNKaPDbD4fFaSsOIWWB3u76itgglr4vyFiKW3aqvcdh4u3iQYqw/j0y+okE7tq37X2p1Mi/qzClIxUaOItmMrHXBMHn29b9kkP8T23Q1ix614bFN+i8qcO8+l2+UU9RprsrgXPNK2KyLjF+qBNxlfqpSWjcnN1DCexosG/Rp0hxtgcXMPPyycqkxUNUuQAwhN55/OdrJJKfdm0agDlJLkAEUeQn6CF3LRYQVCDdI4gzI10E/wztibFOdCRP3bPCSEsRmQ== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:12:41 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:12:41 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2 2/5] gnutls: fix CVE-2026-42013 Thread-Topic: [scarthgap][PATCH v2 2/5] gnutls: fix CVE-2026-42013 Thread-Index: AQHdUBQ1AuM047R3ME6LM/YimJaLEg== Date: Tue, 29 Sep 2026 13:12:41 +0000 Message-ID: <20260929131131.246533-2-jakub.szczudlo@nokia.com> References: <20260929131131.246533-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929131131.246533-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 0796b6b3-e314-489c-4dc5-08df1e2b57a6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|10067099003|11063799006|56012099006|3023799007|12006099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: 9ibq3TRnlWPiVrMQPxRPHspbjUE6BMp6sKuplSsxiredlcrwWzf6dhMBV2GXC5kWnsa4bojL7mXd10EAJ0kR7XB81/S2nflnAz8f1ITKRmNitaWO8kZB0M6owdEj862+Uc2r/vUXLQAFeeNPN/yaIBSxEAUQARjb5SmP/pmk2VqjPHMjApprVqyHXfyZSLc19iRU5bJo7Y1t17vJ394lKQbeM3xlNuPBFophXdWUnmTX76Qm9u0DZABpsy3kCaU3ujVcBKUjUxvB7wuarmWUii6gdDb4w+oaYsUXsRbPVhRr6mSO6JwEdRBUBgO5H0sCOVgni+Eatu3oJmPsWpwTtPG8f3gM8OmfNoDI0sU+LK1+PaPdqVzzY0LMEq25g5eMjBqtDJvVp0UFHYtuH37e89Sy0J+OjKaWalUEn+lGC6fCtX0iYdp4z9jJCA/psd16FiZs4oWkjcTXVswNwjnx7jMLKYGLzLLdnTaIBtshULQfJAosWvjzAmCzBsPq+VAzEpXrYLcu/hBr3BheVil31H4rik9pGLoGxfZ98oTfcuST2IYQ1R0umfRiRRSS35HVWPeG/V/hcyR1o5FA+RQk+lulAItk1NpnbhhdDMyBnzAllFS+zZ4NSon11V9x6WeldwYhOPcpG0kfTBlFtQQwW+DT9FRXX8J1ooFRFSUYHxo= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(10067099003)(11063799006)(56012099006)(3023799007)(12006099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Quit84XJJ8WQcg1rKRvfuINjUPDa?= =?utf-8?q?GqaSwgjoTSSIn35mPmX9dbTc97Hi/zU7AgUC76cSVzpwy/mt819yA6KA2DqIDKw10?= =?utf-8?q?CJPILHttLc7hINFAmwvbu/ktZVIEf2Ksm8Dntt5aiebR+GFgoawDC0FYTkqd5Go6D?= =?utf-8?q?icA9G1BsI1BOPvgtUAc78UlI+dCmtwMQSsSq/0/3kSOqPcSjQtU5U7KvSuV4HePOX?= =?utf-8?q?JCL27SRyZvk2JHblMb5e3TMDzivgJbC8/n0i5QKR/ObyJ2f1wE/F3MxCh1tLhqbl4?= =?utf-8?q?mic2soRwYxcFcJkJk0i357Gp25yj7zZnvHRvbzd5hoStUZg8Ux1ArX6ckK2ielG5B?= =?utf-8?q?p7RbnXX5Tq/884nW9qQpZM/L83b9+5Gvfb5hmvcynJd7eVIp2LdhKJfYrzkk3ifWv?= =?utf-8?q?4YAsvMnom8kQwx4ja/U2uQO/KfpzfKTgTEgJejSCQ9bSv4crULRAe9ZqjL88kP8vG?= =?utf-8?q?sxnTRFcOe7niXM3lS3JiIE6vuQhGSlBfaLAVbq7vt2X+XJOm4KRTNpqhwsqaDmXzq?= =?utf-8?q?9KA5cCRF65mvlcPY74pYB+jU5/2VVOrcG4ZPiYyCmAGcP+MVfh44cah+X1Um1sjM3?= =?utf-8?q?/6kXmpM5BRi/f8tKAkmu85DDKnARu4rUkFf0uM0WHpvx0XgHNMTq5NMz3kYFrN1ep?= =?utf-8?q?J7GSCrlK+8mtTq/IPavknUmEnTIt3kXAlrinL0m50B6kplhbCkjOKkngsLxPQYk76?= =?utf-8?q?Uqzc2slA4JMcm42AGLcySOW16nloJl0XmF6gkMxisyv+x8R1yPBsw/U+Li+XgloLN?= =?utf-8?q?gObDb+secRszj9D5LM6GC1JhChJLFfepcrsrVSh/St1Y5C+bXKt4l3wo1gc7M1q2m?= =?utf-8?q?PTnZfpf4J9liIjQu37EEFngyV2/ygMiMUjhf8KpFUWjj5ugH7UL3IM+5cY6WVI/p3?= =?utf-8?q?eYupsPkCTvmfz98CYT1AKOiyj8tEv15/vdY+tAPj2DvUwFraet/QyOIDqH3lMid/0?= =?utf-8?q?MiDro6BnPYABOgiC3V7uBwcW/ZtO00mBPHjAjeCPYrKUq8d3wYeADLbbZ1FvQ0x1f?= =?utf-8?q?Dofs5jjl52MYA7kr7QpOG/8d/F8xdec7GwOt51p7L4bRWdgs/jaWvwafS3YVZCnsG?= =?utf-8?q?OosSAcxj7sUoSdQ01TvH1hW1Lj91NoMy6lsmaLtp75qHMVHbWLJo9C2B2Au6j4lC+?= =?utf-8?q?lJfPGtnUbMClEGZCz3nY5ZDiHuHBbXp6j/q62Sd0tDq29Z/BbrBKLLrtXfvWZA3jr?= =?utf-8?q?9HlJ4wDnXTvoBeK22YmD9J9JLDkgd4moCTi96uZ+P2TJMaz1WqSvdfo2MolFpLHR7?= =?utf-8?q?wHO8iIKCBn1277ZemH13xbSLUhEpxeEDfEgdYj4ixqk2uoI+xKfRTiMgnZQA0jA+D?= =?utf-8?q?OB28TuzS1b0HxEoU87ZPZoH6raXxn/MXQD/utmXpLzSsP9QiG2WWV0Wi7I1Qpiic3?= =?utf-8?q?19of0LBUokEJgVksqtoCDsQE0y2gIl+er/1k214IrkiuE9daAPgKzwPDfHabxkScG?= =?utf-8?q?68oHEJ7srI2VnUUWM3GyPo5fzKOHhrmwH+ce1skCAPGtsdz4PwOjzuUSqlNEpnMB1?= =?utf-8?q?IDjQETWv57WWJ8OnS4Je41cqGNyynbmh8GsjRPa+As4+0GzbaWCbHDKgJc+iks0k6?= =?utf-8?q?d0XYAWmgLH2W5ouC2ripGUVgZ7KG6on/1JFuCq78NR669YxDUVKM/zVv+v+nA1aHU?= =?utf-8?q?wGHM4++XVnifPUZl5KU+JZeDj8brQ4LA=3D=3D?= Content-ID: <58A566D64D6736438FFAB6C26B1D99DD@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV2PR07MB11919.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0796b6b3-e314-489c-4dc5-08df1e2b57a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:12:41.2541 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: WBBK84n0zY6Ycm1kv4A/Ypb7i7OWtRCtG/SQEqKoJzh3p68oU9FzGdtV76Fcnt+wDXYdyWygu9gAbtAbDqeGX+XZ78T2dJsLb13OUW4UR0w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:12:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246864 Backport patch to fix CVE-2026-42013. References: https://nvd.nist.gov/vuln/detail/CVE-2026-42013 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/29801bef00ecc0f23c0bac4cd333b269cd2c1af4 Tested with ptest Pre patch taken from upstream so CVE fix will land cleanly Signed-off-by: Jakub Szczudlo --- .../gnutls/gnutls/CVE-2026-42013-pre1.patch | 56 ++++++++++++++ .../gnutls/gnutls/CVE-2026-42013.patch | 74 +++++++++++++++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 2 + 3 files changed, 132 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42013-pre1.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42013.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42013-pre1.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42013-pre1.patch new file mode 100644 index 0000000000..53687cb53b --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42013-pre1.patch @@ -0,0 +1,56 @@ +From 3ee2cb707002f755e4bda3f75285caa0cb36c214 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Wed, 15 Apr 2026 15:35:59 +0200 +Subject: [PATCH] x509/email-verify: call fallback DN fallback + +A comment was inaccurately referring to DN email field fallback +as CN fallback. +Rename a few things as well to match x509/hostname-verify more closely. + +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42013 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/3ee2cb707002f755e4bda3f75285caa0cb36c214] + +Signed-off-by: Jakub Szczudlo +--- + lib/x509/email-verify.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/lib/x509/email-verify.c b/lib/x509/email-verify.c +index dbef0bb86e..3c22ffed37 100644 +--- a/lib/x509/email-verify.c ++++ b/lib/x509/email-verify.c +@@ -42,7 +42,7 @@ unsigned gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, const char *email, + { + char rfc822name[MAX_CN]; + size_t rfc822namesize; +- int found_rfc822name = 0; ++ bool dn_fallback_allowed = true; + int ret = 0; + int i = 0; + char *a_email; +@@ -76,7 +76,7 @@ unsigned gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, const char *email, + cert, i, rfc822name, &rfc822namesize, NULL); + + if (ret == GNUTLS_SAN_RFC822NAME) { +- found_rfc822name = 1; ++ dn_fallback_allowed = false; + + if (memchr(rfc822name, '\0', rfc822namesize)) { + _gnutls_debug_log( +@@ -102,12 +102,10 @@ unsigned gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, const char *email, + } + } + +- if (!found_rfc822name) { +- /* did not get the necessary extension, use CN instead +- */ ++ if (dn_fallback_allowed) { ++ /* did not get the necessary extension, use DN email instead */ + +- /* enforce the RFC6125 (ยง1.8) requirement that only +- * a single CN must be present */ ++ /* only a single one must be present */ + rfc822namesize = sizeof(rfc822name); + ret = gnutls_x509_crt_get_dn_by_oid(cert, + GNUTLS_OID_PKCS9_EMAIL, 1, diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42013.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42013.patch new file mode 100644 index 0000000000..c63e4d7039 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42013.patch @@ -0,0 +1,74 @@ +From 29801bef00ecc0f23c0bac4cd333b269cd2c1af4 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Wed, 15 Apr 2026 16:02:19 +0200 +Subject: [PATCH] x509: prevent fallback on oversized SAN + +Passing oversized SAN did not preclude CN (or DN email) fallback +during verification, which is an RFC 6125 6.4.4 violation. + +Now oversized SAN are skipped over, +but prevent the fallback from happening. + +Reported-by: Haruto Kimura (Stella) +Reported-by: Joshua Rogers of AISLE Research Team +Fixes: #1825 +Fixes: #1849 +Fixes: CVE-2026-42013 +Fixes: GNUTLS-SA-2026-04-27-8 +CVSS: 6.5 Moderate CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:H/A:N +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42013 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/29801bef00ecc0f23c0bac4cd333b269cd2c1af4] + +Signed-off-by: Jakub Szczudlo +--- + lib/x509/email-verify.c | 14 ++++++++++++++ + lib/x509/hostname-verify.c | 14 ++++++++++++++ + 2 files changed, 28 insertions(+) + +--- a/lib/x509/email-verify.c ++++ b/lib/x509/email-verify.c +@@ -75,6 +75,20 @@ unsigned gnutls_x509_crt_check_email(gnu + ret = gnutls_x509_crt_get_subject_alt_name( + cert, i, rfc822name, &rfc822namesize, NULL); + ++ if (ret < 0) { ++ if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { ++ /* oversized SAN; proceed without DN fallback */ ++ _gnutls_debug_log("oversized SAN ignored, " ++ "disabling DN fallback\n"); ++ dn_fallback_allowed = false; ++ ret = 0; ++ continue; ++ } ++ if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) ++ gnutls_assert(); ++ break; ++ } ++ + if (ret == GNUTLS_SAN_RFC822NAME) { + dn_fallback_allowed = false; + +--- a/lib/x509/hostname-verify.c ++++ b/lib/x509/hostname-verify.c +@@ -213,6 +213,20 @@ hostname_fallback: + ret = gnutls_x509_crt_get_subject_alt_name(cert, i, dnsname, + &dnsnamesize, NULL); + ++ if (ret < 0) { ++ if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { ++ /* oversized SAN; proceed without CN fallback */ ++ _gnutls_debug_log("oversized SAN ignored, " ++ "disabling CN fallback\n"); ++ cn_fallback_allowed = false; ++ ret = 0; ++ continue; ++ } ++ if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) ++ gnutls_assert(); ++ break; ++ } ++ + if (PRECLUDES_CN_FALLBACK(ret)) + cn_fallback_allowed = false; + diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index 646cc350d9..f85feb7dd2 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -56,6 +56,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42012-pre2.patch \ file://CVE-2026-42012-pre3.patch \ file://CVE-2026-42012.patch \ + file://CVE-2026-42013-pre1.patch \ + file://CVE-2026-42013.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" From patchwork Tue Sep 29 13:12:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakub Szczudlo (Nokia)" X-Patchwork-Id: 99588 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2318FCA5FA1 for ; Tue, 29 Sep 2026 13:12:57 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.24]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7504.1790687565911080143 for ; Tue, 29 Sep 2026 06:12:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=QjJmtmMh; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.130.24, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lQ2kDPuDioA9U6GPsqhovsPOnluXILQwtq22TvCEyH2aHAuD/RndtHbR+5PWxFjeWF+CCIQHDHUz+4G23Ebct+8zC4cztUswmk5mRdcfkp3phsPgCN3ioTXTsfkTkYvsI1etwHDmyRaZLeyxHj7ym45s3dA3l0HmkSe88PYfasTwvp2bybJ1y8lO9bweCMJP1p6fAE96hBCrgKh1/wEyM8EbHzjnjpIBSHsPMjBB/H77mYWbxoQEbKCtC6FEnnEJcLc2+jGOOhSYsC1VoEwOlN8Gz0zx9D8lQOeku4ShWzJFx34SiiAhNmgD/6myxv02EVpil2e5FqEimWkK0CsLYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qENOzkWq0jnM/m02mNSLuzQeFvUnN4sOEB2gcFIPsYo=; b=ch8bGrDUUScPVtX2/MK7SpcIYaP5RRkV8AqWc+P98P4N0YYNtf9AC+0BWDO9QjeLJVZliYvkgJ8PCvIPRFlM98aMmVsKo/uXbblVh7Je4BiW3SUeUZUYAHJ1mBqgf7xP8TujRBs+cCLngX26VoRzLHDL42VDX57X9lRyeBp9praMLLNYoCOGOEihqQJ6s3AtUZd6xpl2aMPl+oRsZQqbySXi7AUn5b9u4K0X79kLNMHzQUyPzsM49eEyiNfAYo+u8tB4WKF8boeNS7SadL83Ak0Ob6VIAZqQ9D3EOH0Uj8kGKREiLdC1MMK4l56mxUI28Gql5+jV/uT43xA5WCNUMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qENOzkWq0jnM/m02mNSLuzQeFvUnN4sOEB2gcFIPsYo=; b=QjJmtmMhfnVeo4YWzrFVwWkbIoS+XZKqIwWzhNyBzB7KrhIFD4aul07jRF6HvHG+S8++7GC84BhBLQrZWLd1tcyzDgMwnJ0jcouVi8AaEzQ6HuNFvS8FyYgTu1HBtHjeXiywuhR1tLQ5URbfBhIK3RRdQIB7W00hCcdiU2ByIpSfUpY99PWOBryROidTxop3rg7Zjj6JlsPv+2u42hXmg/m8EaVysfCHHHSpz/wfJiAkvZmJ/JJZXJXNXLNpmNaOmP1AdWiLcj/QBeWccAZkNE423MyV0qAY0sBC8aFL3mWO+aMMXI8zx8gP+ZSflZP0ju0nqLAYdWbpCik3wg+oFA== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:12:44 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:12:44 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2 3/5] gnutls: fix CVE-2026-42014 Thread-Topic: [scarthgap][PATCH v2 3/5] gnutls: fix CVE-2026-42014 Thread-Index: AQHdUBQ30mWc8AjsDUOPvfdsaQVsdQ== Date: Tue, 29 Sep 2026 13:12:44 +0000 Message-ID: <20260929131131.246533-3-jakub.szczudlo@nokia.com> References: <20260929131131.246533-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929131131.246533-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 4fa41189-2406-4d67-65ce-08df1e2b598f x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|29003799003|10067099003|11063799006|56012099006|12006099003|25016099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: 5D3UNaHSYfN8EtNO6d3pY5K1M9g9/UdsX3HdWaNRq2m4quS8x+NRco2uY2epQoSNwF+NvcQ55UCGCMTEnHgmD10O0ztebi0+o9bkx8jC9kEkFbhRPPi/JheVZKQOxTi3RMY6MeW3XUIpclWrptmCJbEM7GGs3TQbtAnVjXrG4wRZmVtP8as19PUPFTxVQgzMlmV39FsXzsgd/u4A7Rg5184t85tjrxzOV0v/5UlE4BYYomrKAOVjZFf7AZ3kne/c69gMbNdIvmCShAW6MiuSOegoKImOjNrS77rUMg+O5fviwpQpWdObtG+CYNlysgkDp6pFyqpI0kPOGI+hA1dryHqBfZFaUtBkLo/BXlhQWNXfO9p2ukCTNsdyTu0yNpwpZqjgoYQpq6jTmsbXi/zcPZO3rQtl6i95XjjG45Chi3IHiOEoVIyUVvqGObgxKU/L1iIdVNaeVFBysLfz/9eo1PtD4CngkZRkVM8LJFz3pphMcwEZQMKtsuMf8t8k3V2rZoQ/+kVPbJoPjyeyMM4h1swLclLgSkvbaQGZfbk9YFuRc5Uwfbga827WLPscMzrpHpVFUlB+PDFLUDVkG8JjaWV3qduojiQxBU6JTUIFYWWi3CzxGI82bKJlMSrGsjNrBym3NcmFqUCRHrehzT6bCoVSKoHNwN+Qw2eM1NvBnh4= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(29003799003)(10067099003)(11063799006)(56012099006)(12006099003)(25016099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?KvXINSWthXrSjZWevnFoNAX5kvK6?= =?utf-8?q?SDa3Wkoaiph/OsDxv20aAje33Py79twIHYN2ckAOVzi0sCfMeVqHuo4NOqUI2FoPy?= =?utf-8?q?eHNevrUWtYhOGCPAkZ57paPXO3TDUgLNWXnScIOHYhQ7OfmC29pE5UAJlvYquQWQR?= =?utf-8?q?bW7LXZpWg6OlrcVYAPTa5UR1tDWi7mzBXO8J3AmFjWsQV7V6yy5RKEBHI8Skn27+B?= =?utf-8?q?oJGimea+flsUwZS5tgLqS2OacUAHU4FkfBWQ/qwf5Q7oP9ur6J3bhXbGv5DtZxWP+?= =?utf-8?q?Qr/OjzaWEzKBq0W4Mov9nRhkpzXwJLWmZ1nfgYuqBKmdIJrzSzFuHPh7oK4HT3ay2?= =?utf-8?q?Q82PBB8teUvK/l7Aq28vi2OmF7LxrqrR+9cWYSAgfRPl47TlJIBrOsgLBC/nSFYNS?= =?utf-8?q?xicx9f1ZftpTG9c/r8fbUh6zMllmMqu3pinr/XtQ3TpsTuQA+KYYk/nwKZVu5x8z6?= =?utf-8?q?UMNS18ZyAVRcQvQPTzOnG8/A2HqkURUpeQUTHH8wApcMvGlKWVAZUKkHLjbNTdmoO?= =?utf-8?q?qEH1usWezVaU/3vP9AVE2dHovzYiGjICJnAAIhaXkQGjyITS7vSicy+hXa9VGvCzC?= =?utf-8?q?8wcUjIi4QP+YSW4/V4D5V3/hSpqzgbX40mWOz0FPYDbRZ6VLZzlYoTPnXRF+9b+JS?= =?utf-8?q?LgFyEqpsu6lZBXViVDXh3Kd24meRgz7I67d8iw3x582khCLY6Y8KlT5qMQ86vTrkN?= =?utf-8?q?+pkS5PAMvmkH/L6ORSpwdmJoyTuEbwPJHKH+ZdRggYWa+Gv/88i23P2hnzU8Ng+a8?= =?utf-8?q?r6PUfP1Tx6nDzWhoGCDBH1l8uRjxw+tlQdkPUJq0uI8yCwtEb9lNd0ThSJnaE7oKv?= =?utf-8?q?jrM6xiJQeBxXYNAL4JiHGlRp9RmKwZrNJjqsnJGcJFooYJMlWpeok8yU/lOhk/Fj6?= =?utf-8?q?viDHOxOOQREYhxSgIx7RhTigU6YSZYvR8YQEZiTYtJvF6P54WN+fRns90TG+7Rlfm?= =?utf-8?q?X2o8sbRYeKUg/cGs9uf1arGuWy8/Dy9XqDY0giDoHWtYibj07xB+9hk6Ec2RUi9RP?= =?utf-8?q?y/zu54U6iWLVUD7KBEHTAq/9X6scwexS9ZwWpE2zkfuKV5pqEVT9uOl3FO7eGPdA7?= =?utf-8?q?JVvEXvtPRN8sJ9DwDfoFHzxzIahT40+PHmwqaEoeq159blBJTYko/9KT76OwSs2P9?= =?utf-8?q?Lsya1WT3zzfjMnRdAY8stVHGQvfQI52zewryEAakRJT8XKo27dYuNcg0MI6o6I44U?= =?utf-8?q?v0ftV9SmdFHW24Suzg6TOqYmpTCaCNxBjgKfTnVFaboaKpmfodgvWAMxWl/81xufl?= =?utf-8?q?QXx0L6WtdQ5BTeCgnY/ZprHQrdhsvYuxPuGJQ2FtInxdNl2ZCk+Sfv5SK+O59Edbo?= =?utf-8?q?a/xwYypRsX3OItJXMROnpocn6s/GH8BpA6VkoS5B3drEzijpoJ3rpY1UVOF7px4/8?= =?utf-8?q?FtH+Zm9GtYeClqpFU6/VZmaqD3hsIxu/ja6PYhwiskd5HDWmApGsW7xzln9V/Zrrj?= =?utf-8?q?uJnNQ4ZQyGrbxEdOwwUIpSbgj5GUJCqdNpfawgegtcBLaiWe0LVaYiXvPOvxpiRt/?= =?utf-8?q?hvUR0Okhyn4BzYEgmzGBRfDYOX1YDSS70B2Ug4lyFI+uDZRI20Do2BJ4FUESDYK4B?= =?utf-8?q?k8Hykr/r67hBI8tMGkGmY0iNmwIGyuQrxQAORtFFV6xSl36BVb3SohVwct6gmzmOk?= =?utf-8?q?E1cvMuujjLrQtxqmyJTDWqB1/rmNV+GQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV2PR07MB11919.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fa41189-2406-4d67-65ce-08df1e2b598f X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:12:44.4570 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ucq4nqZHdkkJn6KrBgWRAizY8maWeo+ENIln1OOF9hh3Ui6xO21iNHZUNny4wygJb6r7JQf4rwiqd7sxP9yRcs8e4TC5gH6gueKkwoqx0jc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246865 Backport patch to fix CVE-2026-42014. References: https://nvd.nist.gov/vuln/detail/CVE-2026-42014 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/3957f136e2ed23caf176a594b54b3827f5cef701 Tested with ptest Signed-off-by: Jakub Szczudlo --- .../gnutls/gnutls/CVE-2026-42014.patch | 60 +++++++++++++++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42014.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42014.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42014.patch new file mode 100644 index 0000000000..7fd0c163f8 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42014.patch @@ -0,0 +1,60 @@ +From 3957f136e2ed23caf176a594b54b3827f5cef701 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Wed, 18 Mar 2026 18:19:06 +0100 +Subject: [PATCH] pkcs11_write: fix UAF and leak in gnutls_pkcs11_token_set_pin + +Changing Security Officer PIN with gnutls_pkcs11_token_set_pin() with +oldpin == NULL for a token that lacks a protected authentication path +led to a use-after-free. + +Reported-by: Luigino Camastra and Joshua Rogers of AISLE Research Team +Fixes: #1766 +Fixes: #1809 +Fixes: CVE-2026-42014 +Fixes: GNUTLS-SA-2026-04-29-9 +CVSS: 4.0 Medium CVSS:3.1/AV:L/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:L +Signed-off-by: Alexander Sosedkin + +CVE: CVE-2026-42014 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/3957f136e2ed23caf176a594b54b3827f5cef701] + +Signed-off-by: Jakub Szczudlo +--- +diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c +index 961e1b9..9fe571e 100644 +--- a/lib/pkcs11_write.c ++++ b/lib/pkcs11_write.c +@@ -1267,10 +1267,9 @@ int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin, + ses_flags = SESSION_WRITE | SESSION_LOGIN; + + ret = pkcs11_open_session(&sinfo, NULL, info, ses_flags); +- p11_kit_uri_free(info); +- + if (ret < 0) { + gnutls_assert(); ++ p11_kit_uri_free(info); + return ret; + } + +@@ -1291,9 +1290,11 @@ int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin, + oldpin_size = L(oldpin); + + if (!(sinfo.tinfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH)) { +- if (newpin == NULL) +- return gnutls_assert_val( ++ if (newpin == NULL) { ++ ret = gnutls_assert_val( + GNUTLS_E_INVALID_REQUEST); ++ goto finish; ++ } + + if (oldpin == NULL) { + struct pin_info_st pin_info; +@@ -1325,6 +1326,7 @@ int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin, + ret = 0; + + finish: ++ p11_kit_uri_free(info); + pkcs11_close_session(&sinfo); + return ret; + } diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index f85feb7dd2..8f24f01fd3 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -58,6 +58,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42012.patch \ file://CVE-2026-42013-pre1.patch \ file://CVE-2026-42013.patch \ + file://CVE-2026-42014.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" From patchwork Tue Sep 29 13:12:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakub Szczudlo (Nokia)" X-Patchwork-Id: 99586 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7CE0CA5FA5 for ; Tue, 29 Sep 2026 13:12:56 +0000 (UTC) Received: from OSPPR02CU001.outbound.protection.outlook.com (OSPPR02CU001.outbound.protection.outlook.com [40.107.159.46]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7510.1790687570266231899 for ; Tue, 29 Sep 2026 06:12:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=slF8V2Am; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.159.46, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nc5u+4JNruTN7RhXG7E/x5gC9s7+V0MXIBPYa26iJRyE+hbY3Hzh49FnjKfJRrc5PUWuKsmoPjucMdcTnPi6aqpBm7J6Wnv6YC4JeQk+qcga9uLQa6pxRCtiOjcww+lGmKJ1WzOJZj5TWhYASM6BYk6+Y8/fnz8n/cK79RB3VLh9zyrngEicKLomuObeATMTjLQEqGdcfMhmwlw7ZmicPCqCuPvwTQhl+zlgCind1nCnb9ccAeWlrOm6w3gSgVG9Z+wGgKHRsUTM/H6duxMFbAQ2LS+PnYNB55BfhvIbgqAFDt+rdRt+ZJYxL2qO49soQt/v0Ua6U+Gp7dDXTwpuwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KBjcSM33TakQKf3fhYP3EVHfGO6/l/1GKmn1FDZdfTA=; b=T0FGsOB3NzZJnRY8lFu2ILXhw6oMGi9Cpc9BpJaz9cGjEEfiOItkXu06Ta2QrBcnYx4b0Wry9hzrewQE9VQ0Eq3qx3OP+fs5YtzXbGrWW6EOSJdc9elQf8AK8RgxXuvcV1XER6b95gkXEJT0cTTz3xEfZY3sqM59a7J7EonPsODXL94CigTnpe01gSGHCH21xomLeiX0QGrooFkHozCvlwTPfgFBtAyoHEJusxNlQ+m9QG/eBa4qOC46c/JguVlamQM51IHofQDUkLvrUMniQT2gjAHQPjP3CEotWjA8DDnl5JH2Asd2mQEJF7rGwGdVO3sNYRq/3uxS6d1cjPLFTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KBjcSM33TakQKf3fhYP3EVHfGO6/l/1GKmn1FDZdfTA=; b=slF8V2Amsd2X8PfbdF9SEA7Dpj6o/yvIaV8Z+ix4mcWDAaTeMtom6bcQLPcmUYGagDPs9rHQNeQLsOsDbprorBwGDTXC0Lnz/oEP7kQhL4XHK2jnFgM+OmvTL7aRYLb4DzblGNfr3MTw+qhiWrXpacXez/EkMKk/j2IlkIedaa8Crefu5JCAA86xVMUF8P3OeUZKfbGX8uqmjQngWQAjhjXNGfAgA+NBAhAFZE9fketOY0YPvtZ7IhHkSw3GtUtCai6XGLN/9jNrvRFvX5CcQDhXOC19ksS6HzrZfMmn1ho48XyVUIU0qhBniz2JH9ASryZt8XflcbOgFJArJBWqOA== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:12:47 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:12:47 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2 4/5] gnutls: fix CVE-2026-42015 Thread-Topic: [scarthgap][PATCH v2 4/5] gnutls: fix CVE-2026-42015 Thread-Index: AQHdUBQ4lETm4L2vMUOXF39/MjPELw== Date: Tue, 29 Sep 2026 13:12:47 +0000 Message-ID: <20260929131131.246533-4-jakub.szczudlo@nokia.com> References: <20260929131131.246533-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929131131.246533-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 687147d8-7e56-415f-d4c7-08df1e2b5b2c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|10067099003|11063799006|56012099006|12006099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: 5JILGKZFyXLKcNIV/DVvyAk6zQsSSUzstxicfyayKrh4uxdv+6BEr7zCeVbJ03C4Ht3/ncWr6Kh/9r9xBJLt/NGK1ilYp7MzclvmVAOjQ+xhEOCQvGSlyLEojSsJWmVpRHMa/kx0dSvPNLEor9Xw9Fqy5KqskZTnLzKBDKa98Cb+HgG+zyXI8IMJeXNAfqyfwEGtiGKsuQ13dSCKpM0LHmVqvUdgGGmStd777xPgI3TMwk6t5R4ALrVcVPHqa5PiYAhRr2fEO1rRZaK7jlwjCnqjRZ3+x9Tzt1LxBWsldOURyxW+eMhVKhT/tE3ZNOFDXtBaszcRSJ+z9CKbGDA8tMafzT64DvfslBH3eIux4pT2by1PvVoaAIFVsZFn7TK9qCJNKg5yIMX9DX0qmnoA0IVE5tiVIiwEMdew/ROkZz6GoQgeWVUhkZXblbR4Lc/ha29eMJ9jnc1+FC9WTGMDDqu89Mx6f4ZSo3X6w1vDSe+40fY0QFQ8LVpH5GfFNdKHp3+Bnr4h443FvWxcelsU5nR92dnUBYBldiKADqHWpOd07pfo2K+g8VIuTGlYrY0ctYSt8ST/YjIufnCu4oEBc3ggIvKkaHPW5qyeoQrTsvw+iyDtnDWsK+AZi6vUFWLFpdZ2GPrxZpVXcHo6tMn362PBUt1XX5E+ACFzPv6Z8P0= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(10067099003)(11063799006)(56012099006)(12006099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?ajIPg2F78G7JKdUT4T/Ty8cgHo/P?= =?utf-8?q?VWFuwimiVKGBPIM1knUB4IkqQV2AnHrgJg7o4A9ONxCG0/CbDGzEj1qJtKDHJx6aZ?= =?utf-8?q?borKJXkzeDzcNQ3nabeywPD6SMr6Ytv3d7wdLUfDW7hG2lTV0fs5qwGmCFypUfSzP?= =?utf-8?q?87QbF2SD03p0NjAISo3i1tynKw2TqwtvZYOb/hUjXdiqfditUXyME5qbF8l0pa6Zm?= =?utf-8?q?r5jLb5Trwt21qp3uDztjMzBhuoJEpzd2CpECHKIFDncrLiSUb4F4RGjOHkbaGnMqB?= =?utf-8?q?TFRBJk7/ly/93AL/slR+FeEnqEcxCM8/6lW7CVLT2kawfG2bHdzvMl3d2XEfiVamh?= =?utf-8?q?cbBaK1R9fIxq9y2ylQOKmHibQLnHOPUBkT1GKuoDxgNbtPG5B62YxikVtm/46Tppp?= =?utf-8?q?YEqrfRdVPBvX39f8uNcWE7QR2WNauSbi3tHD9o03rYvsmucAArAt0ananB1WAipQ6?= =?utf-8?q?uUXmq9srH5t2Ks5cg/WZon5FffLlf6ywWcyTYMWMTXXCbD8a+YPneSfHojPYHbqR2?= =?utf-8?q?HeXCZyszddq8zUw/MBxvaSHQnpdyYv/b1U6GqwD77zH2rTTcjnjRJw4KutLCzM024?= =?utf-8?q?NlSSOLFSVxu0akv/jUJBDrYwze5lTjYgMsEMo4H+o+LzRQM/mhaFtQcodI1ntu86n?= =?utf-8?q?0TJC3/afnCSktLE2v4lYM2E2cvcO4eQuvYvq3xr8uGXSX+ht6079fgfxRbyHeEaU3?= =?utf-8?q?hhtdhFY2Yjda9+MpMMs2GT2R3yGtOJJvPGdj/ddUS4n4UG7Zw8Pm9ohGCTpWl3dt4?= =?utf-8?q?WUtPblrx1yFL74q08TRFjXjQGVrnvD8mCupqewyCvTOX2f2KeCvzlkdsaTA33AN92?= =?utf-8?q?ov/cJn9d0qj5WHZtS+JN1yM0rcQ4b/GkJjwjysobP/MMhqrWgoZTjlgv4mmzdMT+f?= =?utf-8?q?LA/EQspIyk8pWQXC2tdBJUia3kkxDdi/sty3iHlnPP2mjA+c2AI+6n0dPkZiXeBxs?= =?utf-8?q?kVE6S53GU2Wo/fUTU/PiWFzaJm7J9RUi/JeyIw+SD96qFaJLYFPNHk/nDTci67XYS?= =?utf-8?q?k+z/63UQZyRxsrIL0B+N/PYlynjjUpLpZdctRZCMhJAMRsTeEXH2DMJyZN5DrQqPu?= =?utf-8?q?BtarO2GoiSb7CIVCx1psYALpdKBI3s9Bta3QpQVvsi2MfWd/RPqN0k3+aBkGpa+2j?= =?utf-8?q?fIFvq6EfuLOSEJV1ezYHQHjGxElraT2Ii5JFvpUeIeYl8DAZUVrJUGfS/ZRGklAoB?= =?utf-8?q?uIlh4mN0zE+gXOfXXdGr3kpL8UF/MUMFydKIBIKJvIsoQLsVg3vC3oI8v1tqSFPcU?= =?utf-8?q?if9NtixZidwsvoaND3eVQnPZ4CKMVAyrWa8+fD9BCLkt7MVoo2xXJS9dh/cjwIeo7?= =?utf-8?q?DO8KdeCmgTTvXhPVJDwaGnd+AsEKb2P1r5/4KVWWec+REvJ61qrDC1apbNizk1b8e?= =?utf-8?q?tBpauEWb3Iyyz5zoCvPq9AMlZMNQ6eFNJypSCmIuTA1wRGtdTgYY9sHUmDgNqfWac?= =?utf-8?q?jsGaSCiLw90xnTC+2pQvW00zgY4IRWtgJAO8TAFxpRf38PHCCQc2F3BYogEl7tckQ?= =?utf-8?q?ZQ4ASDlNgSrA8tWon0FfmbFCQketOsjQAzor8m+FXg3NkGsr9gRbDXZB81EY6vtHt?= =?utf-8?q?ji1JDbV3qzMCSNvgrrPgZQJEFoxk2ZXtgBpBlWyMEuehuz39GEvg5EQ7CPe2rGsZ+?= =?utf-8?q?+TkUEV4Uh+7M3X/33cFWGcUq1TrAWJrA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV2PR07MB11919.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 687147d8-7e56-415f-d4c7-08df1e2b5b2c X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:12:47.1493 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7Ury447Bx2XbN5lLerLfwH+hsHJEtbG+EzP0hZC2t9lnF+fii7MnBpTRZByzlRNyxIC/dSbaw/GEwNRT/uDEt7ZXa62WxyfbOYTLGvFaU6s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:12:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246866 Backport patch to fix CVE-2026-42015. References: https://nvd.nist.gov/vuln/detail/CVE-2026-42015 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/a3e7c50d3e1761e5ef1d4b225507cab8f2b2c3ca Tested with ptest Signed-off-by: Jakub Szczudlo --- .../gnutls/gnutls/CVE-2026-42015.patch | 43 +++++++++++++++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-42015.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42015.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42015.patch new file mode 100644 index 0000000000..1a2065371d --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42015.patch @@ -0,0 +1,43 @@ +From a3e7c50d3e1761e5ef1d4b225507cab8f2b2c3ca Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Mon, 20 Apr 2026 22:42:20 +0200 +Subject: [PATCH] x509/pkcs12_bag: fix off-by-one in bag element bounds check + +Appending elements to a PKCS#12 bag had a bounds check that +prevented adding the 32nd element. +On the other hand, it is possible to import one that already has 32. +Subsequent appending then led to writing past the 32-element array, +smashing its length. + +Tighten the check to reject any bag with 32 or more elements. + +We'll treat this vulnerability as a Low due to how contrived +the requirements are: for the code to be vulnerable, +it needs to append to an imported untrusted unencrypted PKCS#12 structure. + +Reported-by: Zou Dikai +Fixes: #1840 +Fixes: CVE-2026-42015 +Fixes: GNUTLS-SA-2026-04-29-11 +CVSS: 6.1 Medium CVSS:3.1/AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:L/A:H +Severity: Low +Signed-off-by: Alexander Sosedkin + +CVE: CVE-2026-42015 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/a3e7c50d3e1761e5ef1d4b225507cab8f2b2c3ca] + +Signed-off-by: Jakub Szczudlo +--- +diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c +index 911aeff..3822861 100644 +--- a/lib/x509/pkcs12_bag.c ++++ b/lib/x509/pkcs12_bag.c +@@ -375,7 +375,7 @@ int gnutls_pkcs12_bag_set_data(gnutls_pkcs12_bag_t bag, + return GNUTLS_E_INVALID_REQUEST; + } + +- if (bag->bag_elements == MAX_BAG_ELEMENTS - 1) { ++ if (bag->bag_elements >= MAX_BAG_ELEMENTS - 1) { + gnutls_assert(); + /* bag is full */ + return GNUTLS_E_MEMORY_ERROR; diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index 8f24f01fd3..bb9bc0af05 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -59,6 +59,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42013-pre1.patch \ file://CVE-2026-42013.patch \ file://CVE-2026-42014.patch \ + file://CVE-2026-42015.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" From patchwork Tue Sep 29 13:12:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakub Szczudlo (Nokia)" X-Patchwork-Id: 99587 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00BCDCA5FAC for ; Tue, 29 Sep 2026 13:12:57 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.40]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7508.1790687573174310106 for ; Tue, 29 Sep 2026 06:12:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=f+hdU/BY; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.130.40, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sK3SitQytl39akO3RhPECjkk6MdXzgnYt1lhm8CnD7C2iZykeDkEikZKPHb8bolplh7tlhQwd/vqNgwBLX5i0nPHbQQ7s7aJz9GX6qajNYpZcEYj1hmlri1O26ndIN7XYs48Rhi5zYfCuZs+wpWtLP9r7NsTT7o3OsmpZXYePK8Ul7k+gIQ9gCg0O8q55ajeCoU5DpAUkCd5STcFcaPKK4dsqISTX02CLV+osjnotfKhcP0pZtAjLuDH30Kx3GKBE2K89yODw+qT40M9GplALpJr5E8a662uc73ah3GkckpuoC5GHlw8f+g8rxpvSfnOdFpbLP4JsyUlPp13050T3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=X5P5uPbAbhDKySe71LNaSPvLcRrA4eEL/BIKrVvc1Hc=; b=ndnN/n9wNhMqfsWFNC+dnYefjt1Hvn9hA7WLWefWRTV17gUwZsJNvJzU3B0/h4KQJGbUUYd7lHUKb2pDAXR8LUkdcaccbklIVH93Ma30EwnLC4KPsAoD1T5ghC7DQd7qwMI5243mHZ+Vw+GAFtP8gwCuGtwTCTn8KuPxVgY4sn5tKqHgfZlxlmBLj7B0eHY2UojJhZJ4SZUVfu2+ycjoTLDiavwMvBiXL2aadH0LUPAKDeHSSc3xkrd05qMWDkSszGlkFarPL6eKi/TG67lQ6PiSNCz5m5Xwnd+lfCeZxoGCikqwyA4unDEo5oX3b8jEJj5Wx7k+oDaz3teoWOUJYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X5P5uPbAbhDKySe71LNaSPvLcRrA4eEL/BIKrVvc1Hc=; b=f+hdU/BYGLztmpIg2jDw2dbBjDNbO9PHcPjpIMD7EJS1dlqXqbdsABySF/PGsxzOJ9GC6BcSmfbbi97CFRrtbnualAz26ukM8hGGbXfX2z8mRGAloZS8QdsT6QMQA0X+4pK2op1n8bd7errHUcjHKswcy1AyNxySAXSs3y9bjru7OO57bTiaKceQ2ur3wMcCdQSJOiMUhgXNKfib/xNpUOPZqHJ20w1fWYhamYGjWL/qiHYas6QTQD1hP0Jp3E2Zj8ITOBlubBKPSQbMbb/Yk5Ni4xTSdONnWsAhNzKeQBBZEQESi1aPI7vO0DjwfEMpT88SVyb1gPO+tT+eB96dPg== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:12:50 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:12:50 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2 5/5] gnutls: fix CVE-2026-5260 Thread-Topic: [scarthgap][PATCH v2 5/5] gnutls: fix CVE-2026-5260 Thread-Index: AQHdUBQ6f3es5YU3qECvYqNmpNcNrw== Date: Tue, 29 Sep 2026 13:12:49 +0000 Message-ID: <20260929131131.246533-5-jakub.szczudlo@nokia.com> References: <20260929131131.246533-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929131131.246533-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 44ba82d2-162f-4e2c-8ed2-08df1e2b5cd3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|6133799003|29003799003|10067099003|11063799006|56012099006|12006099003|25016099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: sotDGxhIbJau2L4yK/urH+5fzpLxEywwH+MmABB1cBRmpJ6BdeFO+ffynajmzNnJjIXhoHtfEfN453aM5TQsUvdM0uhy1G1R0287jFuof0EY5BqfU6Q5vtLjnKKTGxjlVBv5Ns2GprrnAwGFrdvcW2r1wIRO+QCGmb2ow3TiX/3X5QtQEGmTp2iscuQ8B1p3sLzmoYFFA9zKhR9IfiuA4GRpPXOmuHTu1SBAYopddxypANN0QS4jft0q1hEYLqL64xYQCcT0p7cdcHZwGaQUOAUYoURhHjxagWFbz+i+wC/DvN7AcPsxwYSyebACQYpJZX/NlYwqhojeIba7WOtXLvuHHAtRu1I1BXoCbBI8xf6/nAu4a2mxFWr9kzlZmTllwuTWSBSTHNAMrC2+JFKSLdF8WypHqRweB7Yavn4Svb0KqL9yXS5Uu26UCdSyYGT0WgMAKKDZiA+CGG2N02cJtiytyyMzdC/5rN7emKUlrXc6azjuF70UryAQMHegPGou0nwx8ScIcDHl/ttaxAL5vUOZpTe4NBLpAR7ZHp5pKViY1QAjAamnriEhKvLWmqub7uaXIUhNeNfzZUymyBkB5rFERTOgZBOJYsTcvxmRFm0API/Eyu0VO2DmeyUf80VNrMMjx/zbAI/SSZ33bhKb+xeLBUFQiiG8+eia+1bntS0= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(6133799003)(29003799003)(10067099003)(11063799006)(56012099006)(12006099003)(25016099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?CKuFoxj+kcHi0Zc046+2XqJgAoBM?= =?utf-8?q?FabY+iBb81mD5Bt87otIYsK3ozFHQTBN/WaUhQpW53cCqu1AsXaFdKhcd9EoEVo2Z?= =?utf-8?q?injnF8YtLRttSYGuvpPNBtX+zDc+oyDkUWgnEWP1uE53lfv1jbPf9ZxJMxDlEo09J?= =?utf-8?q?H8UymPBA+5lLWKXGfpJJMHdt20YaXt59zf/4UAtUU2nPVTCbnaP+BuutktX1CiuSs?= =?utf-8?q?OLYrTrM7y0IL0pSYB6VHS0CDDH7wwVCjzoIgELbYIvzsQR+EW9i8HqozhP9hhQTlc?= =?utf-8?q?xm4V1eEyFmYJ/9xgg3eeGrPazhFzYrEBDN4hbqi/qenwkmhTaj04qEU+OkFCiE+qK?= =?utf-8?q?aGxqtDbrUvJKWDarZbKhYPBTlgDlEez2dI/HqUMZ1J405ns12O9s9Vs8/GS1dAYQI?= =?utf-8?q?klHm4H3uMveojDh9FlwJ8hO9zEFUlzLNl73k32Ma6mbXUxTUQF5/if1pmmiAOhM7t?= =?utf-8?q?6db8GfPITrGM0zI5ALjxo58JT//+UMnIAuLEcqnJKBQzrCId1JiP3jq2lO9PBW10g?= =?utf-8?q?fb6Wbt8c8b40xz4VAb0SPY+e0Wy9IW+X68sQLibrAD6bacTVyhVjfTdzAuc3CIAlD?= =?utf-8?q?IMcZ/zBSDfjIwz2JFimsnQKovUxnmIoSs9ympd0y9jEUiXih+xJiE7X09p9zZVJwr?= =?utf-8?q?pnsbHuiiZUDHzUJSeWyeJej/c7idm2R3ZcgPRJfLVpUs13hFb11uQJun0dYtdGGjl?= =?utf-8?q?/Dw5WKCAmvBDQiJvgfstMdnhpcVEJljlliT+kNOU3Eect0d9XtK24ITsbNu099jtq?= =?utf-8?q?wwG73I5pInXX+yICqNz0NC66AiiugOby013LVVVuI9xyrDc+CBiXm4tUHMa44Yzo1?= =?utf-8?q?urgFlQrpyqbgpNtk0Xj/a9hHzWhi0c27TIVFWMUpulKyq8FtBOVHxRio0k940eo8N?= =?utf-8?q?KVv+FwaMQLPcDcjOg54IP4RjhzwW27ZJWb0c3QpOWBULC01F8YQKJe/RNWGzRH9Sw?= =?utf-8?q?ufyKiBiuVs9LWpiQP8nVhDs3EA3KRly23nZRuxP/4leIRoNKrb0uGvTIco/NVhLT1?= =?utf-8?q?E1miaLF01CtXpcCt4I+wKGBEdfkBLjKPNw7/ddPQDRGVGOvONcgaTocu4TC5VTkCA?= =?utf-8?q?HPQhDwE7tg9GVJGkuFIt9iomHWwGV2TQQgAclEpB2OhhFlKESfxBE79tjL4HMdu8T?= =?utf-8?q?xyiXpuPKFeJgTEQk47QGpPlSUQXzixYGEfNnke2eOExnNmYSpCRu05XCqHcgRPDrI?= =?utf-8?q?zI+NScp+69Att1f8yBt5bh9ph2BM/rt2EFLLS+z6lP9ErdH0G7VtvZVmJf/PJMsG/?= =?utf-8?q?7T99X0ZVrEZrE9cTCQyUAw2NjgBvzdrHR55Lyv8D3OsM69E13BGbZSMSutpEkfoQ0?= =?utf-8?q?0bdp6ymcpx88Ohy9ICjhu42tQ5h7PzCCnsM59tAtVslEO6SiPB+igUptIujWPkfmr?= =?utf-8?q?XSk43dAASWUER0DCvDtYPtH488KTLmagtTMNMhH80g9DbMO6N7Zor9RE4XR7AIim3?= =?utf-8?q?eOtE+eQ2IKlAPrMDw+z6YyK93jBOsA5RTKC4WK5vH9SUJLxT1cx/QusXdVj+JS9Sr?= =?utf-8?q?4RnVRyTN6S+Dh5Q6w6tfc732r36NtXhly8ve9GmVY6XL03h8ldaO81hfCtczKUgsC?= =?utf-8?q?A93+RXm66Fk0x5ZS+oTWXGKEIlaivHRbbKZy+Uv81Ir+3FAiH1cllOYgF/0HiJySr?= =?utf-8?q?Rm2qbwDlT7MVE7binLwXRrwBKqbFvJpw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV2PR07MB11919.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44ba82d2-162f-4e2c-8ed2-08df1e2b5cd3 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:12:49.9661 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: XShlqbH9Bbj9KyZo8g6i+vDlC84L1CSqFGUwVHr1iHLcWDzlLsbrQmN+8m6IhaIlIxjN8Q87eo94BzKZFbkJsAa3YLZGJPq1F2CnLw9xW/o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:12:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246867 Backport patch to fix CVE-2026-5260. References: https://nvd.nist.gov/vuln/detail/CVE-2026-5260 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/77228f2d1ac207d2f894e5a168fbb47e5378e42f https://gitlab.com/gnutls/gnutls/-/commit/cf6bdc5e4df49e5583d3fb4d2296779785f10683 Tested with ptest Signed-off-by: Jakub Szczudlo --- .../gnutls/gnutls/CVE-2026-5260_p1.patch | 69 +++++++++++++++++++ .../gnutls/gnutls/CVE-2026-5260_p2.patch | 33 +++++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 2 + 3 files changed, 104 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p1.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p2.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p1.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p1.patch new file mode 100644 index 0000000000..f7e6f978b1 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p1.patch @@ -0,0 +1,69 @@ +From 77228f2d1ac207d2f894e5a168fbb47e5378e42f Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Mon, 30 Mar 2026 17:31:07 +0200 +Subject: [PATCH] lib/auth/rsa: check that ciphertext matches the modulus size + +A client sending extremely short premaster secret as part of an +RSA key exchange could've theoretically triggered a short heap overread +to nowhere when the RSA key was backed with a PKCS#11 token. +With this fix, the internal decryption function will not be called +with an mismatching plaintext length specified, avoiding the overread. + +Reported-by: Joshua Rogers of AISLE Research Team +Fixes: #1814 +Fixes: CVE-2026-5260 +Fixes: GNUTLS-SA-2026-04-29-10 +CVSS: 5.9 Medium CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:H +Signed-off-by: Alexander Sosedkin + +CVE: CVE-2026-5260 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/77228f2d1ac207d2f894e5a168fbb47e5378e42f] + +Signed-off-by: Jakub Szczudlo +--- +diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c +index b5ecc09..24c1649 100644 +--- a/lib/auth/rsa.c ++++ b/lib/auth/rsa.c +@@ -158,6 +158,7 @@ static int proc_rsa_client_kx(gnutls_session_t session, uint8_t *data, + int ret, dsize; + ssize_t data_size = _data_size; + volatile uint8_t ver_maj, ver_min; ++ unsigned int key_bits; + + #ifdef ENABLE_SSL3 + if (get_num_version(session) == GNUTLS_SSL3) { +@@ -180,6 +181,10 @@ static int proc_rsa_client_kx(gnutls_session_t session, uint8_t *data, + } + ciphertext.size = dsize; + } ++ gnutls_privkey_get_pk_algorithm(session->internals.selected_key, ++ &key_bits); ++ if (ciphertext.size != (key_bits + 7) / 8) ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); + + ver_maj = _gnutls_get_adv_version_major(session); + ver_min = _gnutls_get_adv_version_minor(session); +diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c +index 399fb4d..7a99d87 100644 +--- a/lib/auth/rsa_psk.c ++++ b/lib/auth/rsa_psk.c +@@ -257,6 +257,7 @@ static int _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, + ssize_t data_size = _data_size; + gnutls_psk_server_credentials_t cred; + volatile uint8_t ver_maj, ver_min; ++ unsigned int rsa_key_bits; + + cred = (gnutls_psk_server_credentials_t)_gnutls_get_cred( + session, GNUTLS_CRD_PSK); +@@ -313,6 +314,10 @@ static int _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, + return GNUTLS_E_UNEXPECTED_PACKET_LENGTH; + } + ciphertext.size = dsize; ++ gnutls_privkey_get_pk_algorithm(session->internals.selected_key, ++ &rsa_key_bits); ++ if (ciphertext.size != (rsa_key_bits + 7) / 8) ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); + + ver_maj = _gnutls_get_adv_version_major(session); + ver_min = _gnutls_get_adv_version_minor(session); diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p2.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p2.patch new file mode 100644 index 0000000000..fd94c64b6c --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-5260_p2.patch @@ -0,0 +1,33 @@ +From cf6bdc5e4df49e5583d3fb4d2296779785f10683 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Mon, 30 Mar 2026 17:46:40 +0200 +Subject: [PATCH] lib/pkcs11_privkey: guard against overreading on short + ciphertexts + +This is an alternative fix for the callee side. + +Reported-by: Joshua Rogers of AISLE Research Team +Fixes: #1814 +Fixes: CVE-2026-5260 +Fixes: GNUTLS-SA-2026-04-29-10 +CVSS: 5.9 Medium CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:H +Signed-off-by: Alexander Sosedkin + +CVE: CVE-2026-5260 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/cf6bdc5e4df49e5583d3fb4d2296779785f10683] + +Signed-off-by: Jakub Szczudlo +--- +diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c +index 5093a6d..369b034 100644 +--- a/lib/pkcs11_privkey.c ++++ b/lib/pkcs11_privkey.c +@@ -826,7 +826,7 @@ int _gnutls_pkcs11_privkey_decrypt_data2(gnutls_pkcs11_privkey_t key, + if (ret != 0) + return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); + +- buffer = gnutls_malloc(siglen); ++ buffer = gnutls_malloc(MAX((size_t)siglen, plaintext_size)); + if (!buffer) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; diff --git a/meta/recipes-support/gnutls/gnutls_3.8.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index bb9bc0af05..7f7f9c9c05 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -60,6 +60,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42013.patch \ file://CVE-2026-42014.patch \ file://CVE-2026-42015.patch \ + file://CVE-2026-5260_p1.patch \ + file://CVE-2026-5260_p2.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b"