From patchwork Wed Sep 9 13:35:29 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: 97731 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 861ABC79FB6 for ; Wed, 9 Sep 2026 13:35:38 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.38]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12382.1788960935098385025 for ; Wed, 09 Sep 2026 06:35:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=EXkbS47J; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 52.101.72.38, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tGkIvPPpBNOF+arMxy3LsY8mjkTzqgSC+5BR/mHy/iRiFp8ozGhaoFDtvLKiRf/dzUU8jIyXac4S4eQ5vvLqPbeft6THVqtd9+PMSwnFfTbNRWZv+ph+SMMZ/x2uRL62ByEYiS0hJ7HqB8msAwz6wzsBHLz4gQJuXtFNxuRmAIg30UwNfWc7g6SI9kpqB88hFgDV9rpSHblj0nTBHVPToACfRZz+uupLfA05TEIlk43RVUjXjEWrocDWt2YtA1GZFUw0Bi+0/pYySbizeB8pSRmozUZ8PbWtr0+uAB3xc6PT7XWCIJhoxG0rked4tw3HlQ9xVyy+GuaDkrLocNe9Bw== 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=+qSzjwqHn89OeYq/y2zrVHCDO014JyYCC+Sg2hZnOd0=; b=m8GmsEgKGHczHXSnwHmmaWWodK+DmrVn845LvkN1YtGcPazS0iiYS3Vhv/sMGWKLJHtwtYiVQvTmJfZRwKRrxwt6Cy9AhGvBIr5w2PC8m55ZVBadeYZ3hLAzrKpqlkafrdxz9JziRbn99U8VbPFgPfLWruTs71zjUSxRDvKuNMWlG9YjpV/lMNIoi4vJMAeRA6hIntBGmNfwTYhyhwI6823ktZlXFra2FQniLqH6WUlh+om/9WK+l/YA2i2YNeXYOhFQEtnIk8Sc8sjNUGY2CbuFXFwu+ZQPpxOq39no1P1dbkqHOtXX3OJeXIadFDEpYEK4ZEWNubZTuSkkZosqTA== 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=+qSzjwqHn89OeYq/y2zrVHCDO014JyYCC+Sg2hZnOd0=; b=EXkbS47JXBBdKZ/cHVojwR/hkw6SFIN1OxtOsvSvnlovHA8o3INPO3vMHbPJehT8lkgw2X2bnYSM9AXORaUQsaukfQI4mKmHWp8o0t7j6OA/adZSNJGM6lEDxF7w64i4YGFvXtSl3BM2E7YWoIDOQuLjyZ4Yi1G+54D1uku7QAaQyRAA33XgZSlB2Nq+pEEf6/BZNoP9VzCQgBiTP4WwgvB2g1CyDjdlPHhq+cUW7dO6DXS6xhgawjHCfi+ckoUGYYSMtmN7lMa0sxcaRzV/cvTHM2wU0f9b7bkf71919YjDVAh1KqK70WKvtDafzWKKBvIfPz1/DfVTwhoAtW9iiQ== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by VI0PR07MB12084.eurprd07.prod.outlook.com (2603:10a6:800:33b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.7; Wed, 9 Sep 2026 13:35:30 +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.0360.008; Wed, 9 Sep 2026 13:35:29 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH 1/5] gnutls: fix CVE-2026-42012 Thread-Topic: [wrynose][PATCH 1/5] gnutls: fix CVE-2026-42012 Thread-Index: AQHdQGAUEIYZ2PsTu06uQUJr4RSawA== Date: Wed, 9 Sep 2026 13:35:29 +0000 Message-ID: <20260909133510.3286-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_|VI0PR07MB12084:EE_ x-ms-office365-filtering-correlation-id: c15a64b5-1a51-44d3-8993-08df0e7736fc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|23010399003|376014|1800799024|38070700021|5023799004|11063799006|10067099003|56012099006|18002099003|6133799003|12006099003|3023799007|13003099007; x-microsoft-antispam-message-info: Mhhf6l1Q55uMM+9ciDn7qvUka4JTEvQ1MC3vzAh1rcqOKac2bETAHCKSk83jxW+fdKRMbcgOTbIDSTMo6ohhMnpVeRUvHsVjA41dZqvjSv5QEgU+pOtMOAri2UzPZAlqaK2shwVEmW0gxg/p6QbEp75zQhInXH+NESWJEs+SAtLIqwILPmUt8iUomFJ1C5+n9fE0hxcA1mGPiNfW6+uw9bhgWUjT1TsNP8KQDaFZ9Ygix/DETl2CznmPD+dtiLZPzVCBtRms16S39phhkdvBHEqGJMpFgCvx3smAE+OJ4y7G9zHto8u/dNMSvJ0eacsoMDGOq43/OeNpI0NpxDG2ApV4C+rqilaUPUtrLpQMleLbhoyTL0eFYN4IY6yUzJxVi1X7y1xeNMUYvMf48iFfSUMvFEwnb3fENAjGM5FL1lMSa7COjuOvptiMMFGYt0eOdbc7zqESwlVoNaRwoFe4GYSxmv3cGGzzJO3zMaOZcQ/615ZNYrugis4YEXnHAnc+2HeWbSEfKBLvM3RTjrmwdzcwpu5/+AmflotaA9+/SbCnXwXWrCHDBpqaFoBwBcj2t4VAS/lMhq6oQ8LP+XqWcPVllWIsw1sUj4OnTkEHMbPsxo7RV8uH03wtDTzTXxOf95FIvYYBno5M2/q+ka+qdgRJCAZ/usCymjVDTa/QSJ5GeZjZUxo4Hh7CeoXlfk5mgi2m40/oJnYIFZVRUUH48RX5ZCirE9KSllVR1skn2hk= 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)(23010399003)(376014)(1800799024)(38070700021)(5023799004)(11063799006)(10067099003)(56012099006)(18002099003)(6133799003)(12006099003)(3023799007)(13003099007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?EIGo0Ps6kDEm+TVSI5su2hk?= =?iso-8859-1?q?npqSZ3MgVg5vQLRF+YLfn6eyx/TqIlPvOORNf/E/fUBQpCTfxVjsEI+prATF?= =?iso-8859-1?q?oOYetU5Z53PUFKkaG2tTTDsqWhf/v09MBqR5oy7u2hB7F1hT+2oWlHl/VDUZ?= =?iso-8859-1?q?eJNhlP06X6AdphSYAhIiewE6Tuf/h3Y6vuWKWKo32Fu0PV+yap9dQWQBFrjh?= =?iso-8859-1?q?vPuzwVEC4y+mB1I6PHPprSpWuOzn32FEp/fcvj8ASygoqsB1ZvTjBkcI4H1T?= =?iso-8859-1?q?JHFT+RA74G4S/pQWWoDnqhBt7ww5YSeHmZRVXwl14hcH/muj9tkMrUieZb0M?= =?iso-8859-1?q?8KoepBhEQzfbZhfDbyCCrHbqOmX15Y2bSEWUw1cOK5ndSTyMbp7JBJtUj4Ab?= =?iso-8859-1?q?opHhKx1abAz/NczQMbMznr7brRT6PICgwcqjEzvUgxTJJDhOEwWuqwCHxanP?= =?iso-8859-1?q?1CEeK3xE4KhSduh5SlSUkm0xpn0Djm4cnM4uhCjXf2fBTbbT5SC9QiN3s2rl?= =?iso-8859-1?q?ou7j+jmsbs4e7MPK5UNa4KASd0hN73d+mu+1ssBw4fbrVvF5MPuLrTtj8gmb?= =?iso-8859-1?q?O/cW1//ATW+okHs9WAwkRkdWX/n8RdvcTXQrvK6WNz7QpW6u2rVFAaw+q+Qs?= =?iso-8859-1?q?u2qGhiH/INRiax8ZRTLZ9kJCXzTv+bj32Zb3UIeanxgkFo211iIb4C936aJd?= =?iso-8859-1?q?fQh0EY2g6zgh9uoopMBKwlhw/y1yKly/DWehc7aJCaJkuByWzlIrLr82SqFL?= =?iso-8859-1?q?IkWsNW+Rax3LXgQgXXhZEh9mXY8KWywf2NzaKyP7B9K14B+IJVLwmFPPs6TA?= =?iso-8859-1?q?4d2nnX+ZGsxlqJ1wiNvIB+14Ak94aYmNmemNmLkQ7GWE+sAmgKHuPv48DMQ+?= =?iso-8859-1?q?7n3EVEwrzQvG6qzPbqrO0avTI22Kq3CFP4aEIa6UVNRUH9eP2V0VZuLlh9nw?= =?iso-8859-1?q?WmW+Lfj1ybpbdWJJmDo54SiQHrwO1jhHBzw0VTxfR3RRUeSXCW/Dpwg+RAUA?= =?iso-8859-1?q?Z4UY6Uk/CYgDQdkYQ7AGDJWJrjCNHadyylX5oXzhR7M4iUaVkAJB7xbY0JY6?= =?iso-8859-1?q?IjNauIRnGYLYz1t1+3Nh8lYwxbLo7zheGvrpExRhCF9hkGHwtVhFW3XUOPOs?= =?iso-8859-1?q?cvozcQr6udXccut/hCLftELxM1QP8wAoJgrvQ/ZKFvLtMlayz4XSxkIzvexI?= =?iso-8859-1?q?O8M7LYHvJmVxe/ACqha4S6GItOO4s/A9MgfA3dI9maSJOIeAQlcyyMfEpBzE?= =?iso-8859-1?q?6ayXxuEmousXu6RglA/wyNBH+9zzGHHMrVYTzOsTmyZG/z/P5zQA1xcsOxT0?= =?iso-8859-1?q?ixOyDSmHlE9+DpuSTMCdkhjNRxqLxJq5zELJ966mIkiK1AzgGb9S+g3DdL28?= =?iso-8859-1?q?ddsuRkN1w7JKBlJJLTgKhm0Un7h6ipU0z5SEqdTkYiq9AR/RgRw1Yt0kR1G3?= =?iso-8859-1?q?BibF97k2LDyCSvxEMGCcOOPnANZs7eN0TGeylg1mYFvDSxP946zF+lhor6UQ?= =?iso-8859-1?q?+yV1fq1ygu7ujHtlB6qSfHOS2jfX5xCqVTg4nORn79nOylRCe3gc9yZ1lj4J?= =?iso-8859-1?q?hxaz4lxHTZfif9EF2iBtX+HyJYw8SoQouzufLTjBhRcoOrFkPx7z5e3qqRwL?= =?iso-8859-1?q?lKjTEbb/6wwkbyV5SpHupUAPtbFvRHmiwzF+YCQ1IjVWYUOZIv9dM8RSXlSR?= =?iso-8859-1?q?3U8fukWCg0/t+Lo34wUQ1hQMeQI0CEKslHEFSMGbev6LJAV7nByeXIw1Je0+?= =?iso-8859-1?q?9csW+FCkrw5n2oVZj4O6pKCZPTry10djlJWFDbG3SPIyQvw=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: c15a64b5-1a51-44d3-8993-08df0e7736fc X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:35:29.5941 (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: LH0cGEmD20y3pn5EwyqbU5ct4VQ3chHaReiHxwVOx29xFE4AQCdUh08cVIsN+RyUqDLsvnafEDE+tmJ/WKpPHnf9UyUXG+x5mhkJF9TvBx4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR07MB12084 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 ; Wed, 09 Sep 2026 13:35:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245463 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 --- .../gnutls/gnutls/CVE-2026-42012-pre1.patch | 70 ++++++++ .../gnutls/gnutls/CVE-2026-42012-pre2.patch | 153 ++++++++++++++++++ .../gnutls/gnutls/CVE-2026-42012.patch | 48 ++++++ meta/recipes-support/gnutls/gnutls_3.8.12.bb | 3 + 4 files changed, 274 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.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..1149dafef2 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch @@ -0,0 +1,70 @@ +Backport of: + +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(-) + +--- 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..c192a144c0 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch @@ -0,0 +1,153 @@ +Backport of: + +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] + +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(-) + +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -2698,6 +2698,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. + */ +@@ -2715,7 +2716,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; +--- 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" + +--- 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); + } + +--- 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); +--- 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; + } +--- a/lib/x509/x509.c ++++ b/lib/x509/x509.c +@@ -1562,7 +1562,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.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.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index 3ad011742e..8716c929e7 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -37,6 +37,9 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42009_p1.patch \ file://CVE-2026-42009_p2.patch \ file://CVE-2026-3833.patch \ + file://CVE-2026-42012-pre1.patch \ + file://CVE-2026-42012-pre2.patch \ + file://CVE-2026-42012.patch \ " SRC_URI[sha256sum] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51"