From patchwork Wed Sep 9 13:36:38 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: 97735 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 66DFAC79FB7 for ; Wed, 9 Sep 2026 13:36:48 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.40]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12406.1788961004133811043 for ; Wed, 09 Sep 2026 06:36:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=js1W/j10; 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.40, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uF6kH2YOiSzvJ/LMgLETSTGx00t3OV6wV1uwvCzX1W2g58Hbp+3WchHItP+IubYC+RQ+pwSSMcoFG1YS8gP3QpePyeF8puo0/9xCBfWkpna5m674HZXAPNnNZflTqhb4iOqh4/TRSoZyHyPVUj/19EW2Lrqd1l4Le/Tg1J7SuK4dTk/QPnYogFr00vuYSMT/zHv0RHDAFT03qCK2a7DisQawIXzgjumm8ZURAHIx/AklPhrPjxaQXc8bginjfXdhwYkFQ/MGRGRfBfuW5mK5OHBaT5wkebX4Vk2gBxs59J7dHHG9O5Cq38RFWu0FWbQoG2g7f5EqBYtx6TB+c2JDdw== 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=CqPZL38Tq8CjZUAwBJq5sQu9BAbBdW2qmAAQNnOW1do=; b=ZWgRjKYQOOIy7VG+D/TGeHpVq0GAAEOJtipxjB4uOrpBBrjU5lZRm4WcR1ftpiYv5VKdc6IQjYD7eBS9dMmA6fLmnHKSAJzbGQ0UEiKGdR7a86Pkc+/1SeJ7JvEAjy5JckCrbs5RVzFzTwyv8cvMdlGpvjtEgLuRCC/KBTLeKC9qw3Ma0sHy7jgiC5M/PkfpeKjPD0JAx2RzKK86cEVjqKtwANlLZbTnyvj5VvDdVBYxIRCYsJGRksnHOnxmzq/8uqPuKzDOc6S19ZSzjSs9WpcDGZmIUzZIKNTOFDtvrjpZiR+86YXSrh1V61m45WgY1Prl1zFuWwyMTlVHhbJFzQ== 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=CqPZL38Tq8CjZUAwBJq5sQu9BAbBdW2qmAAQNnOW1do=; b=js1W/j10IBcz2Ey2K5tsy5KYEWycJgqcw4RSWZ2ef5q0RWLVKJYdrLt2rri2cAlys63eAp5HxlVgARJ3/bGdKxwqHQqSlfzEojOkzaSY8qi7NJJmG1OcjRrFpWIszbIR7ccHlHHlyA/q1eZ2bujsn2KnGa2cpF+7TvlLQiRS1SfMfmVfcMZJ619uUuv3f6qjkR/H+XxNsEFP02FjFePUNzoJ0Vaxzq0a086/9vW5M400Tm+A2bk+9qHyhxFjBvHh36I5D8/PP+cyg3DDgeHcsu8UL9qrncQVXu6gWVRpOYIf3XkKk54TK4U+z/pOZpdInkHfofLBDKsQirJCx9vIMA== 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:36:38 +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:36:38 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH 1/5] gnutls: fix CVE-2026-42012 Thread-Topic: [scarthgap][PATCH 1/5] gnutls: fix CVE-2026-42012 Thread-Index: AQHdQGA9uOpBdqd1/keUEIWvlAoSLQ== Date: Wed, 9 Sep 2026 13:36:38 +0000 Message-ID: <20260909133633.3691-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: c6a5b53e-bdf7-4f30-e03a-08df0e775fd9 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: wLIcL9MdGxUQ6knb+K7DF7idUrjeTDF9IkZu1+6t9jUOKsCdTmP6Wj0Juaz/h2L7CRXyzeoqRE5XHa9oyfELKjDcTije0WLGoEgF1kYz1MU4sd0pthxU5ERj74b17s4lR8a38t2LJph8U1lzEk1nIbsf4q3KoTnLzr7sBFQIU8wutoxCOhQoqTnEF/mnSTyv/BJKtr5MIFrCsUut5vtEctRpl+pjppyLJ7oXn5zVDB4+ORYKtkqpb/pT9gLoU/V+Uzc8OedxT6b+1F8g5UwWKlDtrHyQ1tAoz0RStcIDAk699qpXrnYPnO0in3bX7PTBVTWb1J/mEH2XCc78ji38T0eNn5KsqqjbhBGfhuOafmgg6h+xC/j2A4b1UGFdjxUKVPgMxIWdlpK5F2RLGJYxTK9fnU2IPdllkRNaVb2lf5di+n586GqS4Ym8/M9bRvDw5bk9AqdnRAzldyqDgQLHwLctgeOXbacN/RBNuvRnuUW0f+HybjefUA8qtW9uUlXVB5KSdwNUm4IH4fLw0bju2knN0ssLX6Ggm4DBKDxmO1WuKMHqOAoLQEXscToADGVU3M3opSxZHqKI8U5BtgVVEuHFinWTfYjkymOH4+8Zxq+6cTnecfcmUEK5X6QgmLZ71CsVF3tVNdnppvIkPbwDv4Po96/PqbAWYeH2k/C62L7niPX/s3CQyoFU9Bq7cpHGRtb7xmAktIVTik8Pu+E4tMUJJE1lPHzh0Q+oOruySFk= 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?5GathJaAXTqM+SwBzAUwsk6?= =?iso-8859-1?q?EsU8zpbRkvcds1ZYN4l3v34a+vYciDsCoGHfwqzG7M9V3KItX6p3TEO/gxzD?= =?iso-8859-1?q?c7/lhPwAt+eoY5yYhvTBIso7zFXsraJdQ2lML0MkyzH4FNBYzPkpBGzlngDK?= =?iso-8859-1?q?UTL3uKaUV3gdwHtxWkSAVEilEAbbf3fg+YVrlQcwoXgQvBDgxLOAQBVgBWVw?= =?iso-8859-1?q?oOPNzjfZwkjplxSpu7CEYKvbMqW2n8Jy54JQCRsD6BKFZCN944CdHsVBghGs?= =?iso-8859-1?q?uDZqzevq1VWZhw8ElDzjMj9Sf6bTF75D0YycDrMyxaLR8kDBhXgq4Rhc/Fyb?= =?iso-8859-1?q?7zwuyos0XLtchCzzf5f2etTg/E9cEq4AYRoznBxEjaOlXDwF3/tLoq09R+Wj?= =?iso-8859-1?q?l1vkBGqyKRCg8+lPr2mlmXYOhVjpOwRC3vIC3mmasHeec5RaBm1cZBNqbVgk?= =?iso-8859-1?q?VO0ESCTXh/vU3UZC9Bo2j2oPol1VXMa7FMLbFc2oCMHmLtfHGlDDO2tCW4eY?= =?iso-8859-1?q?wtXMbCW6QayNvvZCC8eU/D85tHbcaM7++p6Iz3XFke21I79I+jc+yQxxmdsg?= =?iso-8859-1?q?LKfoZWnpr+5ItA2ay3FFkGtqeEGYSkdoTIYMP5hpCIbnIvLzV5GNcRVgAnEU?= =?iso-8859-1?q?ChI891VIyE+o0geQ72qkvPVTIV6jeerq/pEWSPzMc4FR5eR9J6YC9KylSa0q?= =?iso-8859-1?q?4WWZ+qxLzv3H/Y1A3WboIrWJu+K8HXgRWbSAo6g/89sLSRE8F1ZG0iZAtGjp?= =?iso-8859-1?q?3lTk888ZLwmFtvtihNMBWmxr/V+iEaxNGZ+wVvd1QPvCZWaoHjvpZ96oGWQP?= =?iso-8859-1?q?EUY1IQ7g/kN6pADT7ct4l2RDbDhoCNKhOmwfK1eQJef8QDANKJGI15LY/Ao8?= =?iso-8859-1?q?lyLIH/JFNLUvuXJZlT4YsEJHiFXCqFYXiqKmU4QoNNk64D4xVLfrN6dlWcNp?= =?iso-8859-1?q?KgwIAa0q51Bl41urqNOoFJ+lJRSnlIlr7aFS5EjKb6ia+ZTYincgmmf11/va?= =?iso-8859-1?q?nr6QCckbrVEB+6DPLQdDlhf4+3Wgwi8D5AlQvvcGTTXyKI51jYxJVlEVAWtI?= =?iso-8859-1?q?XheVWltvbwzG/fLGIvufzywMUBWb2cOamo8Ayy1t2jujnWjCnnRUknw+aoZS?= =?iso-8859-1?q?EK5PtCI1vJbxk5fQV1QVZerYv4FlP6Z+ziEFPBrajTMJnSYG/z3jd1Py/Wrm?= =?iso-8859-1?q?1fFkJY32J4uxzb7hTfsANnw0Afnt3zfUSxs16rjEjjvYVNeMn2ny7D4R2Y6B?= =?iso-8859-1?q?muojBoEqvoUZWhlGmRJfNTV6quDh8SNYRxMAu+t+TaiGGkmFkuMGZXWHxHJB?= =?iso-8859-1?q?ocfaIYPMmPtst5pWoxPwYZjo+dle/Q4EsDQX5viPas7h0vAMEiBvJoscL7Yb?= =?iso-8859-1?q?oF9sZHj6dIklC0saxzGJX+mn5WrpnZqoXw5fWSG4UR0gWQZCm/7gMv/C0eoU?= =?iso-8859-1?q?STCXOmUKRvx/sJF7FCWxvGYFt0Kql7F/seXPcvi02LarMj+aFta1wcNqBImT?= =?iso-8859-1?q?sjh+EzsuP19g9kW5YI96zDUGohIEf941A+UsaMm3fELqn6p8x7/aolawGDRY?= =?iso-8859-1?q?tGrXuo+7sYCISqAfxg8AEOmO6gzOBBa5vWJgwh1hhVNbAJiHEMsHZIQQ4W0n?= =?iso-8859-1?q?Pl2PYGuUl+U0yANW0kwPAAPHWh+ieFbg2d4w5JkHxe6zV+rBy1vIE7DLDDim?= =?iso-8859-1?q?zU2005Vacstf1krpPktezc7l+5lk63F9TwJ4qI+C93WvEZgHbYbTNtnp1hOw?= =?iso-8859-1?q?/IaJPfQS1ZReb9N9iXYe5vIe31OIamsM0trdgObz1k8fKMw=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: c6a5b53e-bdf7-4f30-e03a-08df0e775fd9 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:36:38.1808 (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: M+IbozzAWzYXigYPgJz4lLKgVCfkR9K0g2TlwMKxINel+WthdRnvc9wDoOW09//4UC23ecsedkvi2JqNbd54gr0w+6yEnlj7BfD7gbAxQKo= 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:36:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245468 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 | 156 ++++++++++++++++++ .../gnutls/gnutls/CVE-2026-42012-pre3.patch | 126 ++++++++++++++ .../gnutls/gnutls/CVE-2026-42012.patch | 48 ++++++ meta/recipes-support/gnutls/gnutls_3.8.4.bb | 4 + 5 files changed, 404 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..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..42adccc6ba --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch @@ -0,0 +1,156 @@ +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] + +Backport Changes: +- common.h context updated for 3.8.4 (PKIX1_RSA_OAEP_P_SPECIFIED_OID). + +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 +@@ -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; +--- 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 +@@ -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..3dd9fe5a25 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre3.patch @@ -0,0 +1,126 @@ +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(-) + +--- 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 */ +--- 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 */ +--- 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 0eabc517ce..34d9603efa 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -46,6 +46,10 @@ 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-pre3.patch \ + file://CVE-2026-42012.patch \ " SRC_URI[sha256sum] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b" From patchwork Wed Sep 9 13:36:42 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: 97736 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 7CCBFC79FBB for ; Wed, 9 Sep 2026 13:36:48 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.40]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12406.1788961004133811043 for ; Wed, 09 Sep 2026 06:36:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=dV6p8AyE; 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.40, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VEed60uk5luFTmxUFrMPN9HSZiMCLQHapI25FB8ccVnIAUmphKPZ7lJj3C7hdFqqUxdTHOya6U/U6b5+BOnQomeFkTbsYZ8AG2QBP3gxHHULLmywc2GF92FIGMP0SXLyjLDdtOdqAogSlu8hE45oUGNroKNH+8VuBsQEdU2pZE/CNHuOqeNbmwh9E0y2TwtgIicjp8za3uGU9VfVfzW4lRfQ22Mx+ZcEO0K8+lpdPSynYKqnGKIYXUmGB1ymn4HrL/wpRlbb7iYtI5LHuNZjAYySPcj8w78ZmWb0O1Kv+rhM/hM3j1iBbLrMPgSacmBYD+toCvyLeFGG5LDmtFFpng== 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=e8hdsKmT9kzkLHQtyd18ij+S+NPx+0TuHrWd4XUEZEA=; b=S1IVp5xKo7T24x1NpTmqoisxEUcDMUs1B5uspwqRAW6vFAgiQeCIpGjDatmjhOAjuuXHk8JvNxS3HA1Cpk2AJyyAROorIBd3EsWnByxbi+pjEBxx3phVMxwMIFli01A3kHqkT67VqoEM5reeLeVteZgZ75MIhAf/lgXKiMjjRN9YHXH+NeXyYjhUVK06ybh1EX3cTNjnW+vODpGtwwwsK3+hcKlMQWR69QIi5z8u769q80KDR2jVbZlpsAwvFattYHEN4dmzsZkPl1aPF6us7GtQ9z2b3/PuQWseIM9sdOGMO/5Gf5qF8rkP2gPStcQhBOaaK3FHSxwwusp1nO0F5Q== 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=e8hdsKmT9kzkLHQtyd18ij+S+NPx+0TuHrWd4XUEZEA=; b=dV6p8AyE8r5Q/kskfrT6VVmJjBGz9sc5sAveLdyNEb2mtSS0gOc/j9H18Hak67oA7SGB5rj/CoU+gTwQsy8FracrCsf90VqBpoFYB15Uc9G7AhS2RqsqhY+ICoBEgFNhXQKOvSs12iP7SUUwOL7nrsyOMmmgn1L1M4+aWkC51InOLhS824Tm7ufDVcOETKuz+TzxaEWu5WjP6SAx3zgqTajaEU8UNZ8/feZ5gHPFnnqplsKKhD5+Ijlyin2B1uF804UabgrOcPMG1pvw3TkY9ycyuN6+ax5y1QMLkJY276bgvIsWELJxGwZWkAV0dildJJTD7ZAFUC61WYBN+IkCDA== 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:36:42 +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:36:42 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH 2/5] gnutls: fix CVE-2026-42013 Thread-Topic: [scarthgap][PATCH 2/5] gnutls: fix CVE-2026-42013 Thread-Index: AQHdQGA/FukM/NTv5kCxfZZ9fqVcxA== Date: Wed, 9 Sep 2026 13:36:42 +0000 Message-ID: <20260909133633.3691-2-jakub.szczudlo@nokia.com> References: <20260909133633.3691-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260909133633.3691-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: 379fd0dd-c3a8-4cee-2702-08df0e77625e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|23010399003|376014|1800799024|38070700021|11063799006|10067099003|56012099006|22082099003|18002099003|12006099003|3023799007|13003099007; x-microsoft-antispam-message-info: drNI++MUxRtLhhNw6i0m8S6VHwS6OkFqMJpF6ssU6qL6dDglidCcY28HZ+2k2kJN1hY1Iso+QGObCUtEcMiCsg+4Qu8Q3ye0oHlIvQA+0sJx+kmOWk5FaqpH1Iww6suB600N4BiN90H1ICjvRw6tOoNNQCzc8rCmFnFxpDVxIU0DBaQ2fXepwVDPXOSxG9IBfSjDbFj++Yxqc/pOCzdO6dm6plDUGSSBhPQ+eR4XpCUAst9egTox9cddHsVK6+JBGXv/PKCn9hQjjq7UxrapTfnB8Z6EoREd6ci2u6Ndeq9ty/F/Hw8D7ydr+p7CJKHf+NzUFquCbmH6H89QiOqpTvFZszT/NT+Z5pbkQHfMLjpF11YoyFYmeXZh3c+q3qrCEVlyvbAqf/TF/bfOYjW/sCB+0SmRFNco5+zDlzUfRufViDnH9AYV7qCe3kKQrFuynHuIslgA7cqMfG1vx+iB75Two8md2lgvpy+kd7gGIjKlAeg///Q/vYnNS69KbjgTm/beoEt71w/zqkOJyZWL38e4SqcG66SNHdc3jcd2gZ+4Zg/7lPQDx1h5AL9bmqVJzKbSMjqzEL2EfJz8MTJbCAMOrvWt6FowvlSkvQ2XVh7zDDXziVTNkvZZPcMOfFYjjW7msr1ct12G+4uBTcGJrYYP1wRLh2tFA8pIXNxR7hCbe5Ay2JJ73po226z4eWVf0iuO9i8NRYzN4o8CwdfSAd/gLTvCBl/iy/XFnR6jcZE= 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)(11063799006)(10067099003)(56012099006)(22082099003)(18002099003)(12006099003)(3023799007)(13003099007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?nGXU+9dULTLIvKfW29KnC61rmIXc?= =?utf-8?q?MsM9hunFZ+bN/5Gy122hILanX/6CTVqQAUkK/9bhtaFpU+Al0GbaNtHld4V+q2W85?= =?utf-8?q?/mLr+SfZ6yjziZ3u6nv9b6jkF79fSWOgUWNC6BKCSrQRQRHz5j8Sp8hSucqADzWwB?= =?utf-8?q?xJGxw5uC3XPPPbAE8zW4AFQOVwMvcIom9xZNu9W97NwTmSjPSau1tfbN0/81S/UnA?= =?utf-8?q?mJX8xqHowGBr0JrDFtwHnJ7oMEtRpILB+/wK7ZyPwfS26oawnWhVujtbqX144chII?= =?utf-8?q?ybjSD2T/k45O/CChUezT99sWejB0DqCkH54jmftl90qYLDxwlzhYP3zg9g2td0Eyj?= =?utf-8?q?F2jMJdZhRIzjFr0lTVO4PIjznrk3VbGxR+VpSM3lT2yD0wPr+hgBmx/fWbEL/56nO?= =?utf-8?q?ydhFKfnqG7hGBeBKCnAx3e38i3JfJ7x/gSAYGP7F5GhlgP3gwrufZc/EEnB6yNxkv?= =?utf-8?q?L0PHNDqMfaeycyUsCLVER5PeNfGuJ5YUdBXQ3QlJ7EmMwFYU6KlBzZpktNzFzjsvK?= =?utf-8?q?qGsnLQS+/8YcPXx9+f9ogJE4QatG6Ky3JeMRyeB7QB7yx/3OXaHPq8sdqgy6MP/gg?= =?utf-8?q?UtDA4ih9/+Fv3e5uOBbAALoAOpKvM75Ay8V/dMVG+/KvB5lzY4h0g2rxXov89QZnF?= =?utf-8?q?qqI1AzPzZYslwRV9PaMGD5ThW916Aoot9a4v38eSvr4MgINmQx5irAkyiZsChWjZA?= =?utf-8?q?JEtQHNjo7f7ydbGPs4T0oprfx+25sX03jce10BPeGXeVXVyHTq62DUpCC0chkTHYk?= =?utf-8?q?twbwCky42UUz2KHPUPhPdgwvJ9/ANxQjYi5YFt+hDlH2YC2x1IkJq+8LnkXgr1Cdj?= =?utf-8?q?ys/ZXnQcamOptv4EuOd6YyaWpN7oZ4/a10GpiBTCsXz2r7non/839FS6y1/yUOXx3?= =?utf-8?q?Di+kSr/Gz2AWsHwf3/Wwxxpog7VdzXKoyHOzBjD1KfHRw+3LTFkbre7pPAlNp7KCL?= =?utf-8?q?7lrddy4PAEs8h8/MUV1mt3yc2Boj9vR5uSxaakeNzZ9oKLvBVipp2yV5qOQrKcKqJ?= =?utf-8?q?cSzreqD2cYLrBpHk3gtf77g135HWQ5k6rSqxacvpPbhF+PFjm6gZY3abnDb/HY8wT?= =?utf-8?q?ZhMTMOO+/YeL7VozLLdVMVbRI/PGuV5U7KKiJtcX9T/GThBM6ID7t02iwmPrweag5?= =?utf-8?q?7Sq4JLDoa5Sctkr7kufHyYEEARBNYhl9Q1xPOH5J8sUzBPcim1hGTKoAwepiqjqAW?= =?utf-8?q?EuEaIIpKGGp6475EXJAv6fYstCvCwY13EcjowpoKBvASIF4Hj+OJFtYIIIAx/j54z?= =?utf-8?q?+KbdbK8z7t/bOrWcfUJiEPoWM05P0mt3JkwgnUURu4qAUKlx1qBDZuMU6rIB7yfUT?= =?utf-8?q?zuIbMVi8zuTGRR/rvjG0DL9VET2vkchPf4RTci94qyX/RTaTA3ceJfcJVw6IyDAlh?= =?utf-8?q?iI9ki01xgFyXYorUaKR4rJ05iUm9SekK7Df+nM5vCx6CujoyCi3gLTZSiiZTZYQAr?= =?utf-8?q?jzj46865ghvkRJA4HpPMcungNhAp6Sdbfu4dJWQm2vC8iytcMJWAllKKlWMGqIUQy?= =?utf-8?q?flmlzo7DpnB1mvRTeTrYQMiUNzmoheHsVZ+JmHift71CYQs49PNwy+R8klbrfAEUb?= =?utf-8?q?tg8NYkVb/rsnjVB5hGv8+WtuUv+iUgR3tFgdFzxE8RpCOe3OKtjohN/P8QCN+x/qp?= =?utf-8?q?90B5vOo2mrw1WZwp66rInajrqYzg1kOA=3D=3D?= Content-ID: 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: 379fd0dd-c3a8-4cee-2702-08df0e77625e X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:36:42.3301 (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: yroA9TCFMMEMc3tQjXNfYrs+HG+gM7lBa/EusydoEnYBzOJ+GN2GDLChFWnSAkVyPS1LzQS6UfnOxvkAqNqhjv4yY7meeq2Ircbin+xNqHo= 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:36:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245469 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 34d9603efa..72bec9b354 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -50,6 +50,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 Wed Sep 9 13:36:46 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: 97737 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 6667BC79FB7 for ; Wed, 9 Sep 2026 13:36:58 +0000 (UTC) Received: from GVXPR05CU001.outbound.protection.outlook.com (GVXPR05CU001.outbound.protection.outlook.com [52.101.83.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12277.1788961014367293747 for ; Wed, 09 Sep 2026 06:36:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=nig2rNPt; 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.83.41, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DqMht7VZ9aMMi/678hLrRw5oceGGcWZDiS7IoPq5B0i8H+Al9Ty19PbXROQ3b9zqD3si9QwwatPXqNrU2+znYONmvbf0awXeCia9O15rqesptyifoBCDjZwYka2zG9zip+Mo05vqf6fKWjgj0YxRCv3CpmmQ3pG6s9bipL23A/Agf06ntAclj+hTfGgDm6q0NCPClaIJp+ndSJ4/A5yACDNLsC+DNWA3Zlqqq5g8ykO5M0zFQGal4BwYC2YH7sMWPzWeQiplEflG7zaq8Ych5XVH6VLx6bSbjLZytxQsvCFs2/tGdGwpoO+RrbxdDXRRvOhKtWpPgT6CuFDm5F0xCA== 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=QWGRZM1VJF4FPPJ2Zb3jiU+SmMu+R8m1kxBuStiQr0g=; b=YHybcoMpXbfxg+N2/y6hzBU0jl1007JsVrelcCMxo+ZGgy71tYQnlQnk6LDaZKkQR6pQ3ybhJJ9Sq3YAUHONoW5K4Mds0rd/bGWOUpYOM2OSiK+oCkWissVHp9zpoK8x5cy4twUNaPZ3T1xINJWdEjQ05JLg5Z9RvaSEvOT//7Xwp9epPgTHI2JIdZ9z2LVeKS2gppBR4veAdCejQRy7lAaaJ9OXTC1q9Gsb6G9IA1SPQizexQdSgvI7aKDE3UnjQCioi4jSLivD0HlyJpzogw6KjYYCmCKpL+x1/rMHE5hrYGGI9yKNx7qGDRHhTt7zZ1fQArnUvC9bZWjdWJmZVA== 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=QWGRZM1VJF4FPPJ2Zb3jiU+SmMu+R8m1kxBuStiQr0g=; b=nig2rNPtuD5HxipaKNVD6HbZ5I47fQH57NAQzHSHtzkEwjy1OnK8/Uvl2EuFysqA77MUWnzFT66LUOoCPYL0QBSLdih8lv92BkmKDPLce4790o629Mnm4hLOC2vHuc1tjjWUgoOLLGXQA9XrYhBMcvYU4vxOXkv2O2k1u/6ckYxleBof3V6BvoGHzR6X2A8QRcPht70+VJSeG+wkFFhCtsUhXaiU5zcvvWcG/FMvZDElgjqNu9dqFKbVDYTEFew/6Cp+MjN/3WHMyLvT8xt595FFHOVOpeHbmMhTdafhKb5vin6ZONWhF79Yd3iYuYuzTxcVeIPaHyvbVR7NyoCJRw== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by PA4PR07MB7583.eurprd07.prod.outlook.com (2603:10a6:102:c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.8; Wed, 9 Sep 2026 13:36: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.0360.008; Wed, 9 Sep 2026 13:36:47 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH 3/5] gnutls: fix CVE-2026-42014 Thread-Topic: [scarthgap][PATCH 3/5] gnutls: fix CVE-2026-42014 Thread-Index: AQHdQGBCpCeph0TAfU6c+82eenhBLw== Date: Wed, 9 Sep 2026 13:36:46 +0000 Message-ID: <20260909133633.3691-3-jakub.szczudlo@nokia.com> References: <20260909133633.3691-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260909133633.3691-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_|PA4PR07MB7583:EE_ x-ms-office365-filtering-correlation-id: cff3e6b9-0f2c-4878-a769-08df0e776505 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|23010399003|376014|366016|1800799024|10067099003|18002099003|22082099003|12006099003|25016099003|29003799003|11063799006|56012099006|38070700021|13003099007; x-microsoft-antispam-message-info: zstQCcxnYx/2mcQZUzli7+D98dxyphsf8sv9vXEoUHdzpcPTegO8OtlM6FSkFssZjp6CP+mwuul+Ek/IXbK0oQq3P4TG4G9zDXAlYjrQUWYYfwSl8TzYmHezSyt0XieDOKbOnR4RC1JB1T2u+Ek2GQ3WAelVKbOTd1//q/zC8Jw3Fh/d7WbiAsRyUaSWRNaBnieGANYELdhBk3wrejd4AkXQfT/ijwck1ZH42fjDbShmp4Qx2DGDT/hkaz6Lf2p1dbGswTCiLs6s6pX/nDRS8YJbjqSVy6+PvcNDV+08kuXVv/xqJIIBWFlAkZ2r5MJf4amE6oNzzxiIAYIIF8NWlNyboKFD24ym0R7CRKJcqRfrIZge24djMLDtHbQDoD51yM/ab190DMGg4AjhhHKVh5TTUES8CXpkDWfme2Din7XYjt986AMvdJFYhPddDncFcC5sVpR7ej6mDd//qs2k2zC32pAEtHwcYCDfvJiJm1JxAiaEFXeVCX1dysMKVFoi7gLrX5xlrhGTdQVQ3Zv9OyYvy1jovrhxSh6LlQmwCOX+imKPyFuCudXumGuaJ2oCQBYYYZeDfKUApSP1wp+n13cPuNOgf20f+PXu0QFRhEskwdzz0Wdz0YJa93q6XjMqfFFKt/M7a1R+VKguPT1tBWXloiWZcbLVEQpXswREt3pEq2cXUmNeaCRn40YkCeonYdFQO9ovYL6Ayqck2OsLY6VCbFIvWTOtlLa3QoitV/c= 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)(23010399003)(376014)(366016)(1800799024)(10067099003)(18002099003)(22082099003)(12006099003)(25016099003)(29003799003)(11063799006)(56012099006)(38070700021)(13003099007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?BIN53dRm0EVJ3Ba41nqJgMu?= =?iso-8859-1?q?26C7UZqfjIrWBiGDX9x0PQqKr+MJmYF0NCIXMygEFFBwND+6qKAZumCz6or/?= =?iso-8859-1?q?A2VKzOsNyhBCvs9FBwntjVrgSS2Imt1cOhdp8VIJhc2wvVcerB+iuHjziczB?= =?iso-8859-1?q?Wxx7FhF241lu4sB7nC3AfmG3WMhRT4tSDQqZTyH/8MrakuzSU8nDmDB2rrHY?= =?iso-8859-1?q?SKbzppSPBXURliyEBHc30iytgFVdECASYOxsO2bRFXgvAKsTocwJO/sffWne?= =?iso-8859-1?q?YEonIquR2Y2CUIT0QMoDvcRInxgRFyaGVGy5m8+9C7gGHj7MkuAIkEfUXnsY?= =?iso-8859-1?q?uC2g4QmUzfSRmMl53wLO1cMfFg36orBw2JlOSz+87Pq6dAfdU7RuECfNcs17?= =?iso-8859-1?q?H0Rc8degFtpr2SYKjPUwI/tV/aPG/u0o8WxI0NbloJggeVVsAHfdwZnox+3+?= =?iso-8859-1?q?8sTPrUhfxdBQehekuLICl3/+LAoWQH0Zq1oSo38Chc/scGx8CDJXCNwaINMz?= =?iso-8859-1?q?ZKtLDjKC0o/Bx/Qgz+AR+k0PdxCCOeI3ypvdlyKfklIkHunGQrF4TtRcZB4v?= =?iso-8859-1?q?wQEqkLvNASG93JlEu3BGwO68MOlZrlQYamEMLxIAEnbsEpj8/N8CAUuS8dSM?= =?iso-8859-1?q?8LjuHAKRFfdw6cKE8ajX74Psv4ye+//DlRDygtL0ZGCueMVVPNUayfWo/HW3?= =?iso-8859-1?q?tGbxwodFJdJzAEmHgd+/lFRNL3whMr0gfw68WIJRQgUmR6R7gX+t90aVL5Ik?= =?iso-8859-1?q?slsiUXBJmW3onz7SOFhaOUJFXi5sDwNmCBYOxa7noau9I6HdtkdMbgjiiaV9?= =?iso-8859-1?q?WrwW3IUauwLFjbUs+34zqLeRcdVw+W3hOjJGQRY+3fjZftrx24DI5sYnCYWn?= =?iso-8859-1?q?TGgpbvpZya/0THlxc8KzU/gSh0EopmEz7Knbn47swM/Y0wkLxDrl7s1AXmvN?= =?iso-8859-1?q?RuffX6dmHbaT6v0dqmjpjrgtykDIqXk1sYFXrUAmgJjjAwayw/Qg1wfs2Kvc?= =?iso-8859-1?q?oFDkKyOYh1Wg5krDwHVTkcxa2+sSR7TQd3N1QpnE3ihiaStaYxE+QFLA+wUm?= =?iso-8859-1?q?Skd2EGmP5Sij91j5fppjKTTFBvUPoDqRIYEtIIVfeY1yMGMfr3wyzMNFy3sM?= =?iso-8859-1?q?+QuqbDCzfr2rf0Sj40jPhrbHJNZ9ZOgprF7ov21356GJFTJQqozZKqYrALpy?= =?iso-8859-1?q?wvkbkwo5gH3WlP2Ony52sfKvOBhPhrxc6ABPaKUDSe0Oj3ksgER7cRf34+vr?= =?iso-8859-1?q?H5m7AiZm4M+a7iL1wlci0h0/lyb9KjOtk3OuThYMbCIJQGt/vLHmRYB9i24B?= =?iso-8859-1?q?IToN6mK7ThPb7ZEzqJO3dIgvsuLUY8ay3G3L/5INKhf6txRWDFzxO4EV2Yxq?= =?iso-8859-1?q?cYuFFvVUizZ6aBZ7eMnAbkJNRIJJEfdTbZqCG01dGTZ3c3WUEUoXme/bqS/Z?= =?iso-8859-1?q?MO5TEONPsVZxFrth7LsLQQ9zt2+a5PtY6/vcCg4nQXXaW4w80iIxymetL0Nh?= =?iso-8859-1?q?PU8x9OzOxCi9kCADaCvBxOojpQkhoGUy7iHZyKACjTiW/eR422OftZZOjxBD?= =?iso-8859-1?q?5L5bOFTjyjnCqu4fuZS3TzL6Sz1qTb33C/3MlsXsi5fC5Orz2OUpzD0Zey4e?= =?iso-8859-1?q?Y59/4TiqYXHKqzKsIhdSl1NEbVB/grAYjRxOfH4naVHts6IR252hrTpnRezf?= =?iso-8859-1?q?mo0gTLriuQ1MyqzIEjlBUuG2fZvFAbX61hGnlzZ+ObzRSdn6FdGd88alIbl9?= =?iso-8859-1?q?+hm9DzvMrDv97egQtZIssT49mHdzmfqA7QpkaAy/W4Vp46A=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: cff3e6b9-0f2c-4878-a769-08df0e776505 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:36:46.7590 (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: vFPXVrJIpZJVQ234DWHhTFigOGuMiLqYE+0d2tiqtzKsQZp17UTIxjHDSaT8tOxwCQ+N89yYO1qPEwwUc2483NRF5iM/Pg34cEifMjML6iA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR07MB7583 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:36:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245470 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 72bec9b354..6f1fc4d847 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -52,6 +52,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 Wed Sep 9 13:36:51 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: 97738 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 8622CC79FB6 for ; Wed, 9 Sep 2026 13:36:58 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.61]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12278.1788961016695980870 for ; Wed, 09 Sep 2026 06:36:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=FFYw32fa; 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.61, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iHYmmsUkp3fh32P/Z6fFAuvVMPhLehuWDW+2jKs73jFck1SV37UEB5yxjKjA3SY+Oi0xhNPnwT0YoMMsZukQOvNoJkrrBmM3tIByYvW/5gZV75gM27QEUpPg0w1ZJHiRrZmU+nmKDMrH5Xb1k4X/9G+luwbJOsPz4PBSS3D55lSZXPAMa24puMBwGYXHmxVIN+ZelT9hRSaPM1pRmsGN35aJoZHZCRQzunPu6DsfsAIFqbeWvwRlLw5FXRpv1LhEq9NHiqd5VasQCDdiWEwtt25a0mlXLMprk8JpIgVqZBZBbDDCu5QehUWrePQXKWtXXox1gouIbH8X4UFucjiBXw== 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=ceNRAfC6knGDUFHgUhKFe2tsk28/W5oViQPKiG3oGhI=; b=jAdDQAy6PMKG6dl3hUa2YSCafKctvUjidOx1bzfwVl28MWAxjKEKEGIG2i7+xZsOerEtRt6r2FQ1o+zbIdHUXUqQVpiANzpzV+6/HPjO113MIi8luqM87FxFGFykgA/cH4+ZOxvP4JJBOn711XrFYxlS8RghY25QSBGMtSAY9HlXHS8N93vGe9u9RXS9BbNacyFf60UxFUx1DHk1R5DFRiQMfKB5nklBbHa9OTs3B9Do/cQJTTA8xhcL2Aj1znfk7Fxh72gfAHnvsZdfv6qZshhRHbhvqNsrXI/tKvlg+YuTojWfTYQzmIW0tisSYWgKNWDUvcr2gNsyJcBYlm9o7Q== 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=ceNRAfC6knGDUFHgUhKFe2tsk28/W5oViQPKiG3oGhI=; b=FFYw32fagBcrvmHQTaYP+sP2PoQBbbnKXji3u6BN9yPPxsQQteKwhtDcku7l+9Iks0lYCOJDJjz95yVVj2dPQsMmmw+SaqT2ivqGSwkiRxAMIZgVEzNi7jQqeSCr7gOFvUNr61LKd0NC8BIMo4GL1+j817MkShRTOBMx7HPfQPBHeXh1pyYdRsNsEf5w6IsRD158anNvp3Se98uPzxYtvt99xfn8CY3MBcFVIPhDR+xERD4C3sYIrIU9yW6n29Kgkbx1dYGApDG3ScgaaCxoUd1X5afeZgjFFRBpY5R7ye6c5FF8ymxXsJ2JPku9Xo2CHxpz8ffrNCkgMDf3mSTg+w== 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:36:51 +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:36:51 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH 4/5] gnutls: fix CVE-2026-42015 Thread-Topic: [scarthgap][PATCH 4/5] gnutls: fix CVE-2026-42015 Thread-Index: AQHdQGBFiA+c/Gem2keYu0HOxYryyg== Date: Wed, 9 Sep 2026 13:36:51 +0000 Message-ID: <20260909133633.3691-4-jakub.szczudlo@nokia.com> References: <20260909133633.3691-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260909133633.3691-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: c1b7c9f6-9c16-439a-318f-08df0e776784 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|23010399003|376014|1800799024|38070700021|11063799006|10067099003|56012099006|22082099003|18002099003|12006099003|13003099007; x-microsoft-antispam-message-info: /5ukurUBysEZCURIGrgkLA0eiPC5JVBzqTbGYxZmS5t5amODrPwunmNds92GJAPU5TJRU/TGGrLL1djfDr9VehmYiVL4cL+6ITEG5LgMjrGTeNjtaD8p5mqSvUTib/x0hjDk2xGgHl6Azg3z5WOYYoO3l2mGS1k7xQ5cgAIcgIbd9c0SuRsNP8adRVS0xPUyBR1jJBIPE8WKV7MygZ1tDs54H6mD24IqbQFj8ZsQNRjh6amq/FtwfybbuOXrOqDJDXZ6glhy3LXHZnEHHoikKD/LCnOx9S/pwAMEjIFIVzj7/0ZaeZrPmmV9oXjMFRNLHPVt3/v8PjUkQZK0FCSMyVhQe2KJHTkqNqaaOdY6sSnPlZb+vip41Dq5Swad0PLmuHMXRo8UAdB8FpNoUDm97KaXFD86ru/Wyx7RSm3Mi3FDZEp375G5qos4artGzTBmSlAz5hfYVCQCIiI5wHK1HqDewACFg0Vh3mGcNvH8awfS3CBrHjG6sgW2c/nB47cPkB2c2YNSV+ecsIgweSDXpE1h+TSeUBVeZ/xaBiPFsUzD7Rj9DtJ4LBb8ck9EM2vZU+whtvRuhubfn59G3RyML+ZZZeHcPaaXPNX4SndOb705Sq/IrTLtTP+Cw8DVQhAH1OvJxl0IuIjpMR/BpAtzLAGAV67PAElbKE3xqBfR+BR41JNtHwICbJbpZmQwMBIynv9SdVj/GW+8TKJqNN3cgzdbey21m56mvshqL4TinGY= 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)(11063799006)(10067099003)(56012099006)(22082099003)(18002099003)(12006099003)(13003099007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?g2XH+F33PbKCphhGQXm/tZx?= =?iso-8859-1?q?ZNDB5XzTwiVNLh4QPtxBWn/66J3RekWp2tWMyKvPm6IaWX3d/5S+WovXYZIn?= =?iso-8859-1?q?SBjZCNmtcCc06my6hOdHnsMO61jBPVvM2U/43zRYYQLooduufuLpAZFmNsg6?= =?iso-8859-1?q?aealmSscQLpMt0L5T/Tz/Kxv80YImfg2IUyKxttpSWmpfNc5K1WnQZvWNVZF?= =?iso-8859-1?q?v4iM2m+daf5ytnLjoPyryXsCaFGRGYbMkBpI+eHDrz98MweogGSvXDu530KQ?= =?iso-8859-1?q?5tK/vTKKMZuHdjsyYT/K44UphegqX6VwKIggV3FXLK4a5v17E4dUAdSj+Sh8?= =?iso-8859-1?q?ZmNg7nvOB+bUYrqxMZmPn9hAOm8Yk8OhrUfx4U0cFopzyM3Eic32pnxj+Poo?= =?iso-8859-1?q?/FuQTsmzPJ0w54mlsxTRWWppYE52X9NDRudq5/nn+n5ViBDOIFhaiFQyFJxL?= =?iso-8859-1?q?M6jTo7JRgtE2SSD/Y9k41AT37qEicRXd1HQTXsLQzFMt+7diTPhkzWk3ttQC?= =?iso-8859-1?q?2ndiYRfOEzWo2k3UbrigiEWusx7206WCMAD2DWB80cornj4TD5Boz3OeaVyz?= =?iso-8859-1?q?XDyEseFeJ4lB1pW3Q93nC16pG0MRnNT622ZqH25fmSTtttft2SuWHdKBLtqe?= =?iso-8859-1?q?fTMgzuvSCkMs2sV3dV2cVDU+0WuiH40FTYmC+pZdMvphAwxE5DSL8laSqhYr?= =?iso-8859-1?q?ukcwzw1GpbKCIhbrOQVKGN7w8him9DpI7YbQCEk1ujtMFqu+c6FJTPTvi+xS?= =?iso-8859-1?q?cCfnmk9miKunpH32t23sR4RC0pCDQJQOCbALOWFWbIquvuZ8/IVAda/yYJkO?= =?iso-8859-1?q?+26IqMik6ENafjV/fhxHGvvmCUSHOMKOadCSA16Vkt6cYAI2lt1UJwtzeXDn?= =?iso-8859-1?q?7+0Ia+M0bDKK3C3XtnQ4UgU61b2OHjDcuUHzMS7DAbVjVgz97+hz0Raia3RN?= =?iso-8859-1?q?+ryJX9XSlthaaB5dNOIqZ/RCwKXw+RXID6wKxhxb/WDiFE64KODRf5vF4rhw?= =?iso-8859-1?q?8U3XjUBaVm7mXOtqjzgQUNW2A+KPdaSFvOoqK9RDV/csR6ePNMk0yrIDYbqg?= =?iso-8859-1?q?F1SFlG80gp/N1gU3ck5AeUvYbd2jVeikAaEAa9vgGcOWAl5Nlcvb/4INYEMZ?= =?iso-8859-1?q?ChSNqYyn0o1wRVaSoCAKx8iR6RfvUiFinGwbwtPo0I5MamaJ56AWDYbU7+lT?= =?iso-8859-1?q?meaBxahGwim6dTYCE/pohRqVXyRiPqtVsKfhIVBVCot7hxNHVef0G5prZwNC?= =?iso-8859-1?q?Ol450h/nUJHLdyVVBYSVlbn3HsfyZ1O0nZu4WxxcrCO2eiblRMhJl5p4I3bY?= =?iso-8859-1?q?K9neydwP7RMRMXYiO2iNgBj2a6vXzME+px0aIe5w82Zfi6azU0fGZg6oyIL+?= =?iso-8859-1?q?bBkFqQygeXSIcgEMnNJpxc+hWytKslcCh9i1PurgsgpCfACCA7KL/lbrkhZ8?= =?iso-8859-1?q?P1WoNobD2B20ycdHmss5ViYrEusJ2CuWWxNn6S4D5mWJSqlR3AEP5dRAaODT?= =?iso-8859-1?q?dKBVrRSPiq9UuA+Xo5u4qdAs8G/loBqewSQieIQplRzX9bkIGgmwWzAtHGTO?= =?iso-8859-1?q?z5hQs2eg7dbkpyb9qPgWi4ezbocjiFzyxud/p5JLuLWTK2IPedpdx77a/3Io?= =?iso-8859-1?q?q12lR/EAxTsR49htLOo/4nbQD6kzeP9HmbuZeV4s+4BKgE8wFdmRoJe3zMTc?= =?iso-8859-1?q?pVQl6pZLe1VQNWXPzOFgtTTHZVT9vsB6vlFHYR7LOt2HN11gNaNfJgsWcvNL?= =?iso-8859-1?q?iZWJWSMLwTfVv36Agu/Qb6WZSULK09Gjt+YY/F15psOhW4g=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: c1b7c9f6-9c16-439a-318f-08df0e776784 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:36:51.0191 (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: fnFPdzAdAQQZbJ/MOSawJwsYNNG94LPp669bmw6oDetYySBy2khPKACRYRg3TlblQjUXby2SJosa++t6jR8l3ncw4Wp8vVRIo7tnHnQpbsY= 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:36:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245471 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 6f1fc4d847..38ad19633c 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -53,6 +53,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 Wed Sep 9 13:36:54 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: 97739 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 7CB4CC79FB7 for ; Wed, 9 Sep 2026 13:37:08 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.65]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12282.1788961020485860967 for ; Wed, 09 Sep 2026 06:37:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=L3/ripEt; 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.65, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iG+5sOZHzjnH1XWMomiyiw+3qPsep1VIKjR4V/91Z4ZC3k2aRzpsw3uS0Z09XdeGamSAswCsURvis52Zts7Cr0v0AAq7oTy93JGc9M0Po/TFQi1UMChMlJvZciDGnAe1Gdy4kr+Acl2VplGbo0YKycSP9C01b89a8ueK/fZD+xiGmSI0fMAiwXpk50TphReZ1D58K4wKsxyNBvZXTSWQ0GoyegExj5oYqlvM/Gzcq2fvZ27A28UxH0I84979UvNyjqRfc0v65jkIDqmf2PCoC5029PJ5aMhsr0u3wIuEMeUdzbOWhZ5e3ELXnxYe8dEMQfFfFr3KfCYRkjd5urxhEA== 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=1TrjlAoOpN0c/v+g59xptpVjzGpQ5TPsBsi6knwb/no=; b=v1E/mSZJC2K+KWGO15q5r9QRnMkoFvAW6DHD0EIkuGSTiATNlQoA2eulbNz78Q3/3LVUHVCR85KsRfILv279oySzgM6YROOI0i/BE2zgkQ33SKOu5E3cLzEzbzrQHTh7/AAOY5YwLqnLrPBIF+jgBGGHD/y62TUh5pnSnyNRWI94ZBG/+xwEZqaG7kK0RXC9+Ssg56AHSI9rT075A97y760awHv5syjQHUDtRQJIkyWc5SIKJbAOtxzvZHl8wVvvA9N+9M4RHeBUBRx6FV5RR0FpSs6mh7j4fxegxloRJU3BtBTdGl2mqhqjuYC2jGIA17hfVPaj5H1WR1KdZoiVMA== 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=1TrjlAoOpN0c/v+g59xptpVjzGpQ5TPsBsi6knwb/no=; b=L3/ripEtoOJx9QsLpNFGDHXxn/fjPVbljSdgR51oUacAroCwAy+GSnQS7UayY/AaE5KG1Ky6QTjSTKSxTzPnN+Tn+Z1pDPy6EUitSP09bXrdA7BK4zqADrtKGqZFoA0D6A0T6ERZhsMuWPxy1anA8bycVTnpKQwjdQvrnPKUMQ9ZViTD7f1O7zGUEF7QGFU0QqG/n6N00yTmlDhbHUkjonhxPPvqzJzrWGxHh7Vdz9Nk8ZNHq8nJ+i0ge/A0Xnibtf/ez+Qawt/osKH/ghRWiWvy8eP4wAlmtVSRBCHJs2ZzkSGpWOK+vVCo4bU+BU4MxFDvbJR0LYpxD1pyyIhVew== 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:36:55 +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:36:54 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH 5/5] gnutls: fix CVE-2026-5260 Thread-Topic: [scarthgap][PATCH 5/5] gnutls: fix CVE-2026-5260 Thread-Index: AQHdQGBHzdCdGkdpYUqPQhQp7IQZEg== Date: Wed, 9 Sep 2026 13:36:54 +0000 Message-ID: <20260909133633.3691-5-jakub.szczudlo@nokia.com> References: <20260909133633.3691-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260909133633.3691-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: 0c0c0ac1-0a90-4d93-4226-08df0e7769d3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|23010399003|376014|1800799024|38070700021|11063799006|10067099003|56012099006|22082099003|18002099003|29003799003|6133799003|25016099003|12006099003|13003099007; x-microsoft-antispam-message-info: xPEjfxZAeraFvYTx2cx3jusZcwlkOxPt8Ju4rexDgpLLkTdpD0XGXnxeGbTPuslkpiGhOL2Aowf8kKMsdUXAZfR6HmpDWByUHyrUSR+SLD7kviumj1FJCY1e0IyQ8s+UpzThRCttlY6ebHSCSHZ+yJysC0jZNaaoNHK+iXpRf2AOZ/KZ1TGYUrH0g7ZpvACfDkEH4Bext7YU23rVEwE/DiONHx2UVaJCMuxYHs8kAiWiRI9i7jVroOHgp2OFJK/MA5MX4mmUeR0/57k+hBS3zW0wsOqVEnGeGefo0rM+RSY+lo3HuDAMqzfkJW4VqWgqt4M6Ncr9mXovlkqZwqFj8gZgV2pcgLyDsJdK4yob3QWSBD8tegKKUueJdYLTxUsvBd8AFP5xKFFFjx6SHybHkL5TfVySPVM/GCKmgADNoZb0f66Kos3rQFrop/BpDGIPqcFIouPuTe3M9Pk7zY/O5/iVqsoXmnM0VLNHrg4WdEtzvZNKB8xX8PoaIig2ROzsAFwXGJRXkxXHitR2kgSkku34PzTh5JHiUuPfGL6iQWCeWxxRosHMFsYmoR7LeH5U5ZatD+ZrOElC00hlzVQfUAFozXxlqmM2wL1W1177hNS8TgYfzEVj3PX2qcSotsLO0eoab+UH5TRB/DAo4lhixnQIpZ0LAqXdzNb7zKxmOJBUeHOnwterAZ4qFWmiYKsV38sVSeuYuY9+lc1rv3D311g7p1+Kwv+j++5LLkthgnk= 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)(11063799006)(10067099003)(56012099006)(22082099003)(18002099003)(29003799003)(6133799003)(25016099003)(12006099003)(13003099007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?4VE8yfmmaRbB6MMV0l7Ke8h?= =?iso-8859-1?q?b3zToaYUfngcA2wwW7ipqhHjrwsffy67PeHNHJlrIKyZk3effuBQZg5N6Nrk?= =?iso-8859-1?q?wRBLTvi7oqIwHP9Bh0gJ1VK7XIZJYYpa6sUTTCk9tHiFHC4+ZQnP64gDQkLC?= =?iso-8859-1?q?wPN4iZ3UAJoPQNm1IKWvj7kW9VVnmm1AIe1erBGEn14mElrOOqui0G4+Zo2q?= =?iso-8859-1?q?kmmPJmaDbIAF2A0uVnPxFzK9kaVNG9uUiUkyp/ODBHRdIg2AXhA4BP33BJv9?= =?iso-8859-1?q?R9UnM8c5LbEaschgq765NCff4oDWjJp5mrY22P3qjF1GRT7F4cVDcudJBlba?= =?iso-8859-1?q?YLs37oSdBkPK0G87/vfoJjJYDC7Q+iLSYdwkzmXYhREyW0vpbiNQXJfLCQ7W?= =?iso-8859-1?q?3SE3F+zynIegg1eVK8NZFSTAi/EC7Nkns+CTZBnCqD5wSBlNynlJpSetFitE?= =?iso-8859-1?q?10Uyi7jLbudQqURpzuGpHXM4s8lgqozywRhEpdU2oC2oWcV2+tCAMved9sEG?= =?iso-8859-1?q?Q7vj+f5igOW5sYYlhkPq2seTn10nBpBLnmOfqVJH8FWp3NUAu6HQi8jXBdnn?= =?iso-8859-1?q?RM9pDWWGm4yLeI+BFvLgVg2XWkK3IxsMtZsaLJIi1mnedALFzoHbXIC02JTb?= =?iso-8859-1?q?aQ79rxLUApBwfh/JdPPxFMFBG9nBoJiadmQwUSoc5r47MEscA1WXlUYndbbj?= =?iso-8859-1?q?pLy4zW1TvEdz86brj2E7DvuUqje6+S7N1hMES7VT+lxxDNv8cAl89KctmgCP?= =?iso-8859-1?q?iLDOe8Whl4wQLisJT7tNlYngFmdyJyq8dGM7vVH28cPuRYq1Ygmf0XXdfkJT?= =?iso-8859-1?q?LWDMEusIyAwJ36N4iz2lB8rOPGwg81Ic8tQF74jinxymcaVwwVlS53wE4FmF?= =?iso-8859-1?q?cX5NZcri28x7y3X72uHYjOa4K8phFo58IBGSgJzbjQSW/o/P2zYBdyKhXvGh?= =?iso-8859-1?q?UY2mPzK/cVl2+TLQWAAiase/ID++f9AgtNB0i96rZven3JDrmPeHzXOIsqNq?= =?iso-8859-1?q?Bx2lLaFKu0+5zVF5SLfPcbHMmbhhvJSaWJrS+ZeQ24gF5uTkyqDEfJ7/QjCr?= =?iso-8859-1?q?iipknmfUOmd7jmgGnKpUs5Rw2afiKzxIKxn+Mwc3QpIn2r9C4Df4HqJ/7oQj?= =?iso-8859-1?q?BYlB3pVaENlHQSiFb5AVpbnC8WRcR6iwc8/ZRkbHL99yCqeHLuz7X5z/2z8F?= =?iso-8859-1?q?D6QTTCdtx8Jf1dX6/oz68TsjL0des6GEpvtTzV0TIUEw+nkyfQ9PsUbYt/Lx?= =?iso-8859-1?q?jQLmxaaL81nl5u/51UBwxh2RxUDYgyJaci2/4eWfIywdHFTUZvedpa7LIRAo?= =?iso-8859-1?q?168Z+h2xN/ht/85Tv3Kpgivb2K+d4jtB3ZOfPCCP7ZZQwRXXqAuLDX1vK7Ij?= =?iso-8859-1?q?PnnKnv9PnpnIVKnfb80OA4gEeuKUbznA6LFkWKCnhsVkD6VKw1W+EtVNqKoy?= =?iso-8859-1?q?BefyFHROm2ogrPxzhOcixPMx5DVvmXqnY6ZLBFYcFJ5fEFHP2ByxJZToDjxV?= =?iso-8859-1?q?jQLV9ly6LrlrS5l10n3WDbc8iLiBGQj1WzHsRn1POLQAEhO1f+sOxTo9Pkf7?= =?iso-8859-1?q?9PvS0GjXXnMCHVjnrplgUXvgKsMDrco5wkVNAd0NHRDIUOhzfebOS/oU3CCY?= =?iso-8859-1?q?awY5dYbelImpRYQr+qbS4iG7n3QsrRTxPAKDHFeQH00ZveDqLXbF2humZbkl?= =?iso-8859-1?q?f8lq037z3QF7RfDC0d/KH//TbkoJZ2T9+GXzsn83Tb5CCk+AP+03RMq+UljQ?= =?iso-8859-1?q?n+Ct8YpxfkkfrKr7+7ZsnCsmgg9VVpHtyMRpjht+mDjfS2Q=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: 0c0c0ac1-0a90-4d93-4226-08df0e7769d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 13:36:54.8652 (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: 936ZDm6NoUWwRnps+w2ePZ0zMRZXzc0GEAF4kNeSqIGi0nsOAjlOILXgAobrlC5pFUg1RJMyPCa4kcvfdMtIbq0ITynGhrJQxxu/H1Vpiok= 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:37:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245472 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 38ad19633c..5ec370f0f0 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -54,6 +54,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"