From patchwork Tue Sep 29 13:06: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: 99579 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 EB253CA5FA5 for ; Tue, 29 Sep 2026 13:06:36 +0000 (UTC) Received: from OSPPR02CU001.outbound.protection.outlook.com (OSPPR02CU001.outbound.protection.outlook.com [40.107.159.69]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7394.1790687194720820257 for ; Tue, 29 Sep 2026 06:06:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=QBU3hP0z; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nokia.com, ip: 40.107.159.69, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=diwD3X1Vj47S2a7r31Wyv8JtImS5u1g973sQ9PIEvm/d5o6LkPQM8Z8cR/pxpEZhOGAJsSJaivEx7jef5it4cxgjpJeBW5ntppCtXgTy+JBC2NZa0ZRTGDUmQ+0TacQfIr+672lnqAfNo96CWFX5HciRmqe+GVVaResIS4Ixl5/QZGOfCMEQ0GOxCgQ+x1ohax29DblRHO4y6YhxwkWeqId1hFDMSBqW92HyllFo4wTg+bd/VzBC1x905gnOudHEQHtfRvPHraTh2ZM5R+WQvJTPHMzZ2oTKAJ+V8GK/xnHYRjcJLMd2qF1AZaPma8O/YkdM94ac6gQcISVwNLFEbQ== 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=jIz22Joffdbn2WpleAIUO8UscUKetGP3OTqggUoCqRQ=; b=kyKkTOoM3sPApQEp0NF+XZry0f8kWUAvBnHiIWL/Z4nW5sfHkgsIDrrTRjAMDLME2ZGRwn9RGK8viGPOSS90KDfSBaXsdTssg5lKPFjcL9wb2LscO1zDSQOwPe30zTLbuZI/8E3m8yG5lABPPCwqfIWyjkqe28EHMI39o8EKKX3OFUBstSOhObOaM8GDUHwvtdKWlLNyTwNHocXOsFLG2T2RSO5UBEKoOYkCLJl7BiDapys4FF1BnYlhdtD4z1JzCQGUu/4ZKwhR4g8oOrAzygcEyxUetuRJ+s5Sa+LzA1LciZxETy5PelQKLwTlFVgKqmCuwYTRzASSk+F23xStpw== 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=jIz22Joffdbn2WpleAIUO8UscUKetGP3OTqggUoCqRQ=; b=QBU3hP0zK1d3LGyMBppb8WwV4+6Dc1v+DvrvCBV2A1ZkLCXqU+iLEV1Ar2cpdZ9vv/ux+WXyRSkpmFITteW+5wXLlTzDnHQVO+gHkvAQC2ufuV8Nt4ei80XVY0DjuVd99NgVtuuPwWe6cK93fmp0GAzafnP0Sf6+1yfzh4n+Pa03TtcSEDC15/nuRri0rhN1iertnk+OYlGBxe6MxY51FrLS41cIcvIzgV5MYV04gaVeUQW0SiCbUYQ0D9sTMHAsbbHMtosMPe0LNL7r7b/6CHuvrUZWsCu1BSgtgHltyICSYo6nnOSbwUyjKdoR+JfYlmzXmyt7pH6hv/iGXCtAKg== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AMCPR07MB12280.eurprd07.prod.outlook.com (2603:10a6:20b:771::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:06:29 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:06:29 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2 1/5] gnutls: fix CVE-2026-42012 Thread-Topic: [wrynose][PATCH v2 1/5] gnutls: fix CVE-2026-42012 Thread-Index: AQHdUBNXt3t2HrwBgUmKbe6QawBQqA== Date: Tue, 29 Sep 2026 13:06:29 +0000 Message-ID: <20260929130622.246144-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_|AMCPR07MB12280:EE_ x-ms-office365-filtering-correlation-id: e22126e9-843f-46df-0784-08df1e2a79ca x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|1800799024|23010399003|376014|13003099007|38070700021|6133799003|10067099003|260925021311599003|260925021911599003|260925022911599003|56012099006|11063799006|5023799004|18002099003|3023799007|12006099003; x-microsoft-antispam-message-info: 9Ye/zWQhzHNwaW2iIFHxKbd6nC6CFpcp7TfLjhUGj03MrojyFu+PwxQEE9CkdhQuVbvwQUe+Satu96AVcDnWPmilcWFf1NnMy8toAU/CAjoC3J3q4iVBIrdIx0k0jVIEHZeqnWhzr/zpf2l0aRmZ08nh/bHgze9/oyTN65AM+9LyMj6Yn9IYA8Eaqoa4AAp3rbBZ0LiM2obyR3K1oAqam098siwbwiGZ0yhjJHCJKsq6rK0P1zHFXlQT+pyJj/YduuzVNsQ/TSCehn6Y5BT3SVagnoGjw1L3dN41ajFzw9+TTXON1wG32kiHMJPtf8qrYbXwB9BCPWXh8508nsIeiGgQlvRgEL0cY/psnrI/dP/v24eu7UvYxbFxPyKywOQySMSZRbV7C7yvhZGj9pW1j7mbYarRIaJ4KB7aF/9F3wCt79Zm9YQiBnowR7SiawPihElvg1yBkogq12OvN1hINplPCDBlU5mNwNwonz1TaRh+x7+PL3SwEwtBUjq/vfibx7lS/debufnBD19l816WtHsREH8INzgfZ9CCjwRFXT5usVOFfW5Q+kTlIcu+Um49MqzocZ6StU5n6mKHehQdTFoNGBc2AvLw7sXh1srKz2olNvf1wuS2lOauwxiK5pRUZ4pnf5lrwQGDCoxEFTvy3hizZsO90bVD5dCKICnkZc8= 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)(1800799024)(23010399003)(376014)(13003099007)(38070700021)(6133799003)(10067099003)(260925021311599003)(260925021911599003)(260925022911599003)(56012099006)(11063799006)(5023799004)(18002099003)(3023799007)(12006099003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Cj7rvhMNbzJ8PZCWbj/rHgegKo9T?= =?utf-8?q?5c53yp2o+o8RAQ5z7Sdzec+3J5P5RJ+5vbGuTFhq/IcqS0eyVtVXmjPedAVwtubF+?= =?utf-8?q?3VOwsRybB8RhlhDtA/kSuBJ0FVK3t84yu4uYuoveOFurs95L97PQwjsyOz6zKCQQq?= =?utf-8?q?TiaI7Qu6AYNzaMrVKXxr92u+lIwHImTng3vrj6UYm7QAoke49kWP56eKHNfw+BedK?= =?utf-8?q?lVzERKg1sDFIIFLa8zGKh4zNZf3E7fOcnk5ldKLLPst1I1L3ZUwmzrS++nf8AkBuH?= =?utf-8?q?SFDoV7pocspSlI0xHhjAtsLcpwgeg7fxtuU/b3cJygpbyvTuTeJpxbOHeRmRfyhx4?= =?utf-8?q?IoHBDof5x42vJoTfyQOrAu0vjDgf6yVMDgwJwwUQ7LEHjEbSETscC9PFpk1w2ixzi?= =?utf-8?q?TjRZzKttTDpEShJIpyMR0AsM46eWDWdfr5nwu6wUuIbL1LVWMiDaUPeuCHkO1OB5r?= =?utf-8?q?a5vkhovilnX7CN+jEKJbZ4cEt/8uuhrZBOqnpp/oHiEHZg/aArCu54rfY3qRxbduX?= =?utf-8?q?b+uGyw3toG8qPI0MCyCsj4zBfeFYF/+PvfPXBOYXscNP9ft3caoGn+ZFsKzH2dkWf?= =?utf-8?q?CWClGrJuVXhMyTENrXvN/NoG0KLVsMGy1satxSd12i1mo6NbvQdSFmrHNvtMCcWBG?= =?utf-8?q?vinPjqkSovuS1U85V/I6K0DjKeCKO05HEItgnG9Krkni+0SDAE6yL9uHaqfiWCZkm?= =?utf-8?q?bWuRCt7T+HxfVKII3uIbpj4WXX4Cq57yUsTUJLaJXpH9yGZjUgOkxR81YoReJKOK4?= =?utf-8?q?DIQPzUbVT33gaisy7PcFYfPcrjUDg8TlmrnUdXBhMg54AnT+sKOyMdVqZNksrV5C4?= =?utf-8?q?xq2RX1l2X93AuacdZu/mj+1LvJGSCAwJ9zNIxyMOmb7a0Y85JqNEGSOQTPKjmGY/5?= =?utf-8?q?4zytx2qpVd/zrLdWs69BnUmdD4SiDEpoaw5vN/61YfCNu22+JSh1HnKQHFGLaYVhX?= =?utf-8?q?era0zsj1Y6jBQGweKy/w6X2sTv9jvbKXC+cQpuP/VR1/duXr/Ln2EoKOOWOoLax2A?= =?utf-8?q?cchMSrKe/oOiLE1haCNwsG9jYFP+lATarzGd/PQmDsMqzLP1quCrBIgwqITGsaWs7?= =?utf-8?q?J3v98d6FO3hJaMzc4qYzi9+mRlkWAVgPjs0Y/VDibj12HD+iUFEwG8BqFoaW1u/jF?= =?utf-8?q?QMUZmQl8kdA0HxnMdOwz90VdR6q8yqq3NobtABu6YMsuuxwbnDdTwuBYgcMhuz6sy?= =?utf-8?q?xjfid7aB9dU4XAfPDGG9NZQAeQveK3PjNfmWZ2g26L0vkBi/pVhxnkMY5MPG4gsNx?= =?utf-8?q?cAgS3SjRqnaEn5js/kEgc7IN+LP2+WbRHxJUxB5SLW2tQIpD0giJ30rk//6eejt67?= =?utf-8?q?OZkLN06BYxHjuyvLX3MmCLfbul+ytqZIMHMXRXaosAQ0wy18Kn33Gm52Xu/hRKoxw?= =?utf-8?q?9HrVqxV8qaLglJwoN4cb6oRoQJku4WW0R9dfKaH2Mif/VvlacxbVXNXRXHKH4JFO+?= =?utf-8?q?v0Xhfa+Zd4ltGjpzOcf9ZIKGCKjt1BfzSikMpDBm/h/GLFB72RlpEJkTtYWTnh6T5?= =?utf-8?q?1ca7J3N/2CoPLJvDIOS5tD2/sW2uv9l1S5yVVqsiqv7qbFQKpRab+vTzkVvhEiYsn?= =?utf-8?q?6k7TC9eNuzT9s44CKjjgk+f84zYvms1TMualOX80ajf3cwtXF5xNs77f7BxrmgeIo?= =?utf-8?q?fPOZgRS3myBTWFD7XWu+OrAwbteOENdA=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: e22126e9-843f-46df-0784-08df1e2a79ca X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:06:29.0292 (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: erjck+QoUvJn4su5031c8ktFq52L3M8pqVKBnXrYtJ8t3k9GJK8DJCV5zoTSC4xCyLowg/ExDZPCZtDHguDx6XcMgEDW0ud8TUV4kHPN0qc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMCPR07MB12280 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:06:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246858 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 --- v2: - delete unnedded lines from patches - correct patches to have also diff lines - document backport changes in CVE-2026-42012-pre2.patch .../gnutls/gnutls/CVE-2026-42012-pre1.patch | 69 ++++++++ .../gnutls/gnutls/CVE-2026-42012-pre2.patch | 161 ++++++++++++++++++ .../gnutls/gnutls/CVE-2026-42012.patch | 48 ++++++ meta/recipes-support/gnutls/gnutls_3.8.12.bb | 3 + 4 files changed, 281 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..9b2a5d16ca --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre1.patch @@ -0,0 +1,69 @@ +From 6133fb459b74a9dcfa2d0ff010a4e03c56822d39 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Fri, 13 Mar 2026 17:00:03 +0100 +Subject: [PATCH] x509/hostname-verify: refactor and simplify CN fallback logic + +Signed-off-by: Alexander Sosedkin +CVE: CVE-2026-42012 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/6133fb459b74a9dcfa2d0ff010a4e03c56822d39] + +Signed-off-by: Jakub Szczudlo +--- + lib/x509/hostname-verify.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/lib/x509/hostname-verify.c b/lib/x509/hostname-verify.c +--- a/lib/x509/hostname-verify.c ++++ b/lib/x509/hostname-verify.c +@@ -108,7 +108,7 @@ unsigned gnutls_x509_crt_check_ip(gnutls + * that we do not fallback to CN-ID if we encounter a supported name + * type. + */ +-#define IS_SAN_SUPPORTED(san) \ ++#define PRECLUDES_CN_FALLBACK(san) \ + (san == GNUTLS_SAN_DNSNAME || san == GNUTLS_SAN_IPADDRESS) + + /** +@@ -151,13 +151,12 @@ unsigned gnutls_x509_crt_check_hostname2 + { + char dnsname[MAX_CN]; + size_t dnsnamesize; +- int found_dnsname = 0; + int ret = 0; + int i = 0; + struct in_addr ipv4; + char *p = NULL; + char *a_hostname; +- unsigned have_other_addresses = 0; ++ bool cn_fallback_allowed = true; + gnutls_datum_t out; + + /* check whether @hostname is an ip address */ +@@ -213,9 +212,10 @@ hostname_fallback: + ret = gnutls_x509_crt_get_subject_alt_name(cert, i, dnsname, + &dnsnamesize, NULL); + +- if (ret == GNUTLS_SAN_DNSNAME) { +- found_dnsname = 1; ++ if (PRECLUDES_CN_FALLBACK(ret)) ++ cn_fallback_allowed = false; + ++ if (ret == GNUTLS_SAN_DNSNAME) { + if (memchr(dnsname, '\0', dnsnamesize)) { + _gnutls_debug_log( + "certificate has %s with embedded null in name\n", +@@ -236,13 +236,10 @@ hostname_fallback: + ret = 1; + goto cleanup; + } +- } else { +- if (IS_SAN_SUPPORTED(ret)) +- have_other_addresses = 1; + } + } + +- if (!have_other_addresses && !found_dnsname && ++ if (cn_fallback_allowed && + _gnutls_check_key_purpose(cert, GNUTLS_KP_TLS_WWW_SERVER, 0) != 0) { + /* did not get the necessary extension, use CN instead, if the + * certificate would have been acceptable for a TLS WWW server purpose. diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch new file mode 100644 index 0000000000..30ed2252c2 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-42012-pre2.patch @@ -0,0 +1,161 @@ +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: +- virt-san.c: use _gnutls_steal_datum instead of upstream _gnutls_take_datum + (3.8.12 already provides steal_datum; take_datum is added later). + +Signed-off-by: Jakub Szczudlo +--- + lib/includes/gnutls/gnutls.h.in | 4 +++- + lib/x509/common.h | 1 + + lib/x509/name_constraints.c | 3 ++- + lib/x509/output.c | 6 ++++++ + lib/x509/virt-san.c | 23 +++++++++++++++++++++++ + lib/x509/x509.c | 3 ++- + 6 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -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; +diff --git a/lib/x509/common.h b/lib/x509/common.h +--- a/lib/x509/common.h ++++ b/lib/x509/common.h +@@ -107,6 +107,7 @@ + #define XMPP_OID "1.3.6.1.5.5.7.8.5" + #define KRB5_PRINCIPAL_OID "1.3.6.1.5.2.2" + #define MSUSER_PRINCIPAL_NAME_OID "1.3.6.1.4.1.311.20.2.3" ++#define SRV_OID "1.3.6.1.5.5.7.8.7" + #define PKIX1_RSA_PSS_MGF1_OID "1.2.840.113549.1.1.8" + #define PKIX1_RSA_OAEP_P_SPECIFIED_OID "1.9" + +diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c +--- a/lib/x509/name_constraints.c ++++ b/lib/x509/name_constraints.c +@@ -516,7 +516,8 @@ static int validate_name_constraints_nod + if (type != GNUTLS_SAN_DNSNAME && type != GNUTLS_SAN_RFC822NAME && + type != GNUTLS_SAN_DN && type != GNUTLS_SAN_URI && + type != GNUTLS_SAN_IPADDRESS && +- type != GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL) { ++ type != GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL && ++ type != GNUTLS_SAN_OTHERNAME_SRV) { + return gnutls_assert_val(GNUTLS_E_X509_UNKNOWN_SAN); + } + +diff --git a/lib/x509/output.c b/lib/x509/output.c +--- a/lib/x509/output.c ++++ b/lib/x509/output.c +@@ -121,6 +121,7 @@ static void print_name(gnutls_buffer_st + if ((type == GNUTLS_SAN_DNSNAME || type == GNUTLS_SAN_OTHERNAME_XMPP || + type == GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL || + type == GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL || ++ type == GNUTLS_SAN_OTHERNAME_SRV || + type == GNUTLS_SAN_RFC822NAME || type == GNUTLS_SAN_URI) && + sname != NULL && strlen(sname) != name->size) { + adds(str, _("warning: SAN contains an embedded NUL, " +@@ -180,6 +181,11 @@ static void print_name(gnutls_buffer_st + name->size, NON_NULL(name->data)); + break; + ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ addf(str, _("%sSRVName: %.*s\n"), prefix, name->size, ++ NON_NULL(name->data)); ++ break; ++ + default: + addf(str, _("%sUnknown name: "), prefix); + _gnutls_buffer_hexprint(str, name->data, name->size); +diff --git a/lib/x509/virt-san.c b/lib/x509/virt-san.c +--- a/lib/x509/virt-san.c ++++ b/lib/x509/virt-san.c +@@ -45,6 +45,9 @@ static int san_othername_to_virtual(cons + memcmp(oid, MSUSER_PRINCIPAL_NAME_OID, + sizeof(MSUSER_PRINCIPAL_NAME_OID) - 1) == 0) + return GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL; ++ else if ((unsigned)size == (sizeof(SRV_OID) - 1) && ++ memcmp(oid, SRV_OID, sizeof(SRV_OID) - 1) == 0) ++ return GNUTLS_SAN_OTHERNAME_SRV; + } + + return GNUTLS_SAN_OTHERNAME; +@@ -59,6 +62,8 @@ static const char *virtual_to_othername_ + return KRB5_PRINCIPAL_OID; + case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL: + return MSUSER_PRINCIPAL_NAME_OID; ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ return SRV_OID; + default: + return NULL; + } +@@ -126,6 +131,15 @@ int _gnutls_alt_name_assign_virt_type(st + name->type = GNUTLS_SAN_OTHERNAME; + break; + ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ ret = _gnutls_x509_encode_string(ASN1_ETYPE_IA5_STRING, ++ san->data, san->size, ++ &encoded); ++ if (ret < 0) ++ return gnutls_assert_val(ret); ++ name->san = _gnutls_steal_datum(&encoded); ++ break; ++ + default: + return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); + } +@@ -187,6 +201,15 @@ int gnutls_x509_othername_to_virtual(con + othername->data, + othername->size, virt, 0); + if (ret < 0) { ++ gnutls_assert(); ++ return ret; ++ } ++ return 0; ++ case GNUTLS_SAN_OTHERNAME_SRV: ++ ret = _gnutls_x509_decode_string(ASN1_ETYPE_IA5_STRING, ++ othername->data, ++ othername->size, virt, 0); ++ if (ret < 0) { + gnutls_assert(); + return ret; + } +diff --git a/lib/x509/x509.c b/lib/x509/x509.c +--- a/lib/x509/x509.c ++++ b/lib/x509/x509.c +@@ -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 538fd9c9e0..885e6fe8c8 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -42,6 +42,9 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42010.patch \ file://CVE-2026-33845.patch \ file://CVE-2026-5419.patch \ + file://CVE-2026-42012-pre1.patch \ + file://CVE-2026-42012-pre2.patch \ + file://CVE-2026-42012.patch \ " SRC_URI[sha256sum] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51" From patchwork Tue Sep 29 13:06:33 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: 99581 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 DD6A0CA5FAC for ; Tue, 29 Sep 2026 13:06:46 +0000 (UTC) Received: from AM0PR83CU005.outbound.protection.outlook.com (AM0PR83CU005.outbound.protection.outlook.com [52.101.69.17]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7395.1790687199042747810 for ; Tue, 29 Sep 2026 06:06:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=IquSUxjL; 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.69.17, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iXBmMMrs2QHeqomIQRQy8JpC+oi/8Fweeh+Xkidun00toM1xf025icprava2b7BTNMnAQhgRNxGs1J3AJ4Slr6n6VT6trzLw+/rErv5LqrqQRAIM7sHXzh5z/k/iGC6lJyWgfT5aZd/GuwxYLoV5H1VAQg/+vY/4hOVHYVAfx0P4tmcvwARCaWEIdFnpfj+aWjemBMKLfwy1QhpKOz4YX1vFLpJ6PA1AVm161NSh6cVVRYBsCq5NohZ3NtcnZ4/ls+dS32Kq2VQ99xWMiV36V6DqmWuR0BqHIbAPkmROa9R2lcXYOPO8ByYfjpy0Fv6ZKsocPHkfqXh0y6Fum9pkow== 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=ov5DHcqbnZuFv1Y+jibQWSlggj5x2VcdvrITjMlkm0c=; b=XyfiX0jicLxjZkObVL0nKxlAf0wGQaEcqrSgDuGYpurqIO71JE48pjuPzloCK4WpOXfJ5uOFwIhXHRA5P+PxAXvk6nwDsBZfzGFbzzmZRN1C4VMdVe1SLLghByBIPK2EeTiNzZ55iYpK0E8KtOKsbV6hKfrqbKgfmTcZ6mOL8NQxbJcgWPBeLbmqibbRVLBUMFD7u1drA3BySWl4jeBUI6kwascJiEnqDFFfLRAfbWcYn9/CcbvyeIRfVsSFpV3tPfuhtEl1SfUpWnlYaYqI8E7fRdYYEupaGKvEYoOPq94/JF7Ag+KIH5Nt70WKMUOmmrUOLqQYw0MamYV2NZLvXA== 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=ov5DHcqbnZuFv1Y+jibQWSlggj5x2VcdvrITjMlkm0c=; b=IquSUxjLBSsti5AJBZm+jhBzDzL1PuGdQFmo3aT16WqdJvgX0NTn2aOld0+m/cD1w0hNUZbiZ0+kSDK5UydwYxvmU/phU3uSvH5+RuYiTmkzObnZaOQSNw7rVOds0OisFsK8HJ0qp4hh5p+HDAghBs4swfUloeIUUKgL+30W4Ru1TIbQrDkA9+qsA5a++v1qLnfPUx9qFYekNH3iLRFLNvR+e4g2lSP0sMw8bQ3sTsj3FCtl9vZ1CZzhuRusOBhD+Bgj6Eqoa6WKvPfjnwTTbO89aORtwDrClnIEsBG6OXbzkJjTpI/31tz6HQo746d+TfcQwnLpmBCHfSl7RCEklw== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:06:34 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:06:34 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2 2/5] gnutls: fix CVE-2026-42013 Thread-Topic: [wrynose][PATCH v2 2/5] gnutls: fix CVE-2026-42013 Thread-Index: AQHdUBNaZ/VAmBbIq0ODALavX051AQ== Date: Tue, 29 Sep 2026 13:06:33 +0000 Message-ID: <20260929130622.246144-2-jakub.szczudlo@nokia.com> References: <20260929130622.246144-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929130622.246144-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 136eea29-ae9c-4244-90ef-08df1e2a7cb8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|10067099003|11063799006|56012099006|3023799007|12006099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: H3RMqBHuEajBGeaRiK5ZvoBimD+MjVgaj5H64eM/9gOCN07GhxT2gp4IJStf07uyvZTdfdSXLexaD2gQffEfLhQEHk8/4M2NIPPdSsO//LypKnytlhmKYnQwmNjz4OAzRHHgJRY27esKhM7+dT6NyD0IM76mHll2w1e9wg9Hb/HoqwHHnsODHcdZAf67gCESGFlLDMZ/lxKzNkYGOZDVjzKTNvYcXoU8HDs+u9lDOYbQgoC4JP55iQFjnKlhhK2hSK87HpIojh0kQJQgri8g4aboMcYJtcXAXPmCOwYz5qW4AX9dwEMfwu4OQgqetgIEqq4FydTbeGDz2k+1LzxIGOIdYcisv8b3iNpCFVLSMMvTAv9+/DvkVWXbABHn5oiVhwlMc9zp4ol+F34xrmm5Zrj3HSpvUsneUveltBPcfXMA7wlGi4lBJqxXPtdz22AEMCUKWb9kNOwqaYFARS9PRXlVRVNy+SMC5daKUUA8udiWPs0nnCaQ2h15Z60DgXmegolmS3p5yWqhGzpSg4oRgcwErpCJ4kgQLdcGIzPdpxP+7NKHUKLqHU9o677UKXHJ+VXfl+z1C37AqREkrRy3FbubIQBsmWWy3uUtYtbn3gRmhW2NhsOMfFqHXBDmhiD3ImynL/bEwpGXDuU+QmWu1EjqVMIGS1K9kd0upqFxzok= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(10067099003)(11063799006)(56012099006)(3023799007)(12006099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?NXHz7WZFGFWjLOcKqicyu2Ts3POc?= =?utf-8?q?LLrDqMb3JYaJaGJGlZEUhZBLbGU3s6KG7q8mprxPDatBs34dbgOVbbcI8MQLPw6GO?= =?utf-8?q?dJ1OZ8Y34Avp5qax8NGWNR+YicbQ3zFWlyB2eukUfHJx967V2kwZBbLXAmLVQe4nf?= =?utf-8?q?uN/HQep4Ao6u+IoVvMDm2+vW2PMTZOxqY553mtFV86a2rHzNxKeCjMkUfnFr3setl?= =?utf-8?q?8c0mqXmcxLhLdw6fkTkAQl+pmfBMf4FDXbyiRJqPbtHYgOz57E+3UDj2CtK+NX3N7?= =?utf-8?q?06Gwo8bGYJMo12KNY/uYVux3POX5ScrnrUatGzf6S5joGkRcPwb7JAkQxOEDdZSeI?= =?utf-8?q?3t6uXNuuBeycvlt5A1o2zy6e13TII+CRlOkj76rjXfrgSxN3S0UeKgNi3r9HWVmRN?= =?utf-8?q?af8fwyFsTDOKuLXd3CnoqcAem7Tg0NHY69qM2kYSBAzy0WT0AHfNe6hbjGZEH04S4?= =?utf-8?q?ivhH3LWz7QYVC5I978LZ905xm/cLdDUDxFgvkgfeuMu4wguSw9VS1Dk9d0y6NLbV9?= =?utf-8?q?xRz1d0UQf7e2dCM4x8p8QzFYWTkzsGu45MyiVtjy4uCBlu/0cTf6KZT4MlLJg7Iu0?= =?utf-8?q?C2+QWb3QtnIjDw1D13kOL8NwhWY59zA7mqPlJcggL8RxAn/CtY4Gu7zzjvv9laW6A?= =?utf-8?q?y4uArw3KdWc0xujW1d9s3rRisqdJA35aDe0G9rnLip3cTDJNgvSJ1AmDWXanxNze5?= =?utf-8?q?lG3+lvg8aEpj5vFnRw/sh+oN5NzcmKh5cFsdPHGLsQWRh99aqC+sl1lWnzGcn4pLO?= =?utf-8?q?Ix/8JQmLF3k3amsk8FoTGNfWJhVg3gL5mTJxwU9I6mlZAvJdVynN5xPw62xg7LIOU?= =?utf-8?q?QQa5g7GMedEY7TiTXz3VnRVfDOSvzrBHqNeyAJ6MvuLT64wMm4VulkSs0GUdB/tFD?= =?utf-8?q?QIy4SjbV6aHtrY5mSMuNqbKqH5HSoVg+JV9OQbtyJMow6cSMlNsmIneGM4FdSMBd8?= =?utf-8?q?0pMGGaY6yeLP8x6FExnH5lxm0GAeYLhW+UVQPJYuuUQqtJXnnPicg27x+DA00bouR?= =?utf-8?q?C080xwuxCg2u1C/LFznTGdM/p/Kvb3uBqLdfb8fb0K5ycqXk+pd+a1SFQKDvsBuPu?= =?utf-8?q?iLyoBXDijh4IpuJAIwLNbgUpzwBO4Hqpy2s1mCJuEpDtpx50P13nLtZ8tHwgvjn0X?= =?utf-8?q?jX2t3H9I8TWioSHMSwNf9ucWEHogFv+7MROeeMNNSpeGcF8aKv4vMbIdKtZMEBL+s?= =?utf-8?q?Tq73VhACTKqX6OVHOYeQQj4QcttV9VzKWMjxz591/7YbIxzmsJwYJ2mp5MQB96z8f?= =?utf-8?q?3GcZ2imkbyZhMjuXJJ3JxJymSJv8ZELTJq9t0QTkA7AC1T3FYAakOndPKblGmrQ3M?= =?utf-8?q?zDE3t/WwAxNL1bvQ+C3LEMvZFqYdMj7lA/tOtVfY5NmLlpeK/rFg9BxIAhszSECtK?= =?utf-8?q?7ORqTasR6WetTwvuYBvRU2T9c1P8xBDxtiG/qHKrZ0B6ky4Ec3R4xZfMxEEZJiCr0?= =?utf-8?q?XiI2cE5h1REt9rZZGqnY+DlW6A10UNKz8CgiFigWow0840iUM1D4G1aAEUq7aUTaz?= =?utf-8?q?lvLAA8DcNiVxKs8Z0jJ9R3juh2EbZ4ukOBI3xGBg1mLL7H/r2Jk9Cl6L/YcdnPj8l?= =?utf-8?q?thZ9DTU+iy7emu8b0F7+mr3Edc2AQ96GxIGsgtrQJcheaNe/iN81NMhMoyS87Achi?= =?utf-8?q?i1Y29NeNHyGMYSh5ys+dykzNYUEnV6fA=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: 136eea29-ae9c-4244-90ef-08df1e2a7cb8 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:06:33.9786 (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: R0INLTpY8k8vASZ+WLKry5z99Ge/queIpHQ8EsahLauKHF0tBZlSoCXHL1ZGRDHK0pTtICBD5rOnOQK9ZI4ZKvqTK89OrQAhjvxKig3uNdc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:06:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246859 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.12.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.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index 885e6fe8c8..bb3328b55e 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -45,6 +45,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://CVE-2026-42012-pre1.patch \ file://CVE-2026-42012-pre2.patch \ file://CVE-2026-42012.patch \ + file://CVE-2026-42013-pre1.patch \ + file://CVE-2026-42013.patch \ " SRC_URI[sha256sum] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51" From patchwork Tue Sep 29 13:06:36 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: 99580 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 D07DFCA5FA5 for ; Tue, 29 Sep 2026 13:06:46 +0000 (UTC) Received: from AM0PR83CU005.outbound.protection.outlook.com (AM0PR83CU005.outbound.protection.outlook.com [52.101.69.17]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7395.1790687199042747810 for ; Tue, 29 Sep 2026 06:06:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=IqRAx3BR; 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.69.17, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ECOkxaJUn0pOAsnd0LxkHe+QD28ZgInbQOO5QURHeS9BBYxA5Rq7ONLzeyyBFjIU39PFSYyi90luM21dPUiVxx9JDKNsCp0LajPgSey12LY8gI/29wtN22t/a5d3zcztDenoCWL4LzACFodNVjcHR8kAeyqSGatnI4DgRxye5Ivcg2AKyOM/XJI489px5L36cj2BT2ZASGfM2boc3dkmj0fQo9oQYCevwxP5a6VjIgbF1d9g/t6mizkg1OnUcgXxFWYpFJyFlHORxgkAF6ZdNkp2qvu5Ja8DUxj/74qS6+9gOGmzCyro3QiW2QVONNmgP3FSJ2A4FflKTLqJsfFTag== 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=HC8NpQczFPPGyy7a/OusyLwpnqIl3PVpjVKZ5dGV4Xk=; b=lP3lE33/2cDLDSMq3sbRle+En0e4c8mn7plEHXSOEMsRkbIrlcKaThiELG/VwdT+XShjh+IqDgoHzdOnwbo60R6SPauH0QSX0LybnfVgu2yvsl1NOSRCkVw4BIOXv2D/7sMb9ZEpdn388CTwrVmlBlhvLD+rf3grFJM8ibMc0OC9MptM7dQu/gSJTyE2TQpM73vT25zWtVRZ5HrqTC+Zk4R5anmrvq+vHA9jXj6fmh8ddd4tZOggTo1UAxP7TwtpFJ71UkgUkWPHkps29hPY7SQLVmjn167vnW86I8OzFbrGv/RzZuyKzL5byDQdwhnrHdVwFII2V7K3BhYJHeGdrg== 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=HC8NpQczFPPGyy7a/OusyLwpnqIl3PVpjVKZ5dGV4Xk=; b=IqRAx3BRubN4A8LoNdGWA1RJ0dmf95t1bwa1tt2tKoeyI9hShMXsUN3kf1iZYcVrUHYRocYmZKgeTi0F/ZawgsJy8kXyCEYIe7X9kH1xSab36ZC/8/AcS932d8DIWLc3W8omgdEXfVZcMeKYryc3lMBMy6O9Eyr+vxRyJEcJW/hPysrPocj+Uxxo1BK5OoLlEepI9FYXbgkoLtUO/eQTa4YHl2OBsy8eQeZadeEw5CpGrRBbC47rJjBWWAqeAWkXR2lrwRjptfa/dxseOMjMoRjxvgX6fi6sh0jTvweUdzqAwuKKn43Tx08hCkKFdhWY4BNMbIa9NuGAkdR/OBwjeg== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by AM9PR07MB7219.eurprd07.prod.outlook.com (2603:10a6:20b:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:06:36 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:06:36 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2 3/5] gnutls: fix CVE-2026-42014 Thread-Topic: [wrynose][PATCH v2 3/5] gnutls: fix CVE-2026-42014 Thread-Index: AQHdUBNbHOc49H6TaE6F1Zb2LnvJUQ== Date: Tue, 29 Sep 2026 13:06:36 +0000 Message-ID: <20260929130622.246144-3-jakub.szczudlo@nokia.com> References: <20260929130622.246144-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929130622.246144-1-jakub.szczudlo@nokia.com> Accept-Language: en-US, en-150 Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nokia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV2PR07MB11919:EE_|AM9PR07MB7219:EE_ x-ms-office365-filtering-correlation-id: 9c66b089-ade8-4e66-6197-08df1e2a7e5e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|29003799003|10067099003|11063799006|56012099006|12006099003|25016099003|13003099007|18002099003|22082099003|38070700021|260925021311599003|260925021911599003|260925022911599003; x-microsoft-antispam-message-info: P+M4wjor+2RnnGYdv9xj3vOy/7X9qcHPTdT0qsS2DxM8R1b61bR1wUZo+sRcxafcm6LDTFjQKvA3xambm7Oa37B4D6NU0xUhxNrMZU0z8CMi8Fxjr1QkgFZ8k0U1cQa9CAjaaSp/Bj4xMuq+uTSmioyJAo05tsDpDFnTAkoA6OK9n/Tt6xw32aPrjo4kAbFU3EEqyL94S78ujxLorMavw0oMjXCDiu7MKiwxEG644b3FuRHrkHHVBFQWRrRVvmyojK/Lwu74ueZojWGkMbR+enkQkV2jDAD8URAwFwVnLqBxfnaJEH56jnE0XTGbuQw4hfE7RI/ovUocibRcaFKgP7iOLpx4GVpaMc+AaTGfpySOD1Kupg9vHS9Shj835qnoMy74x3nT25BNobhmpHnxdH3Bm7SfOAS+z7MCBpwmZD0im1ggzC2AZcLZ88I3DuDnh16kFtv2EXqaunGyp474lseMGWwa0pNFbHbP5oLRadq8lKRDBnG6baqcBvMfJEcnrnKu6a8J3giV9HKO6iW35ZL1gDx4XoJtRxxl/GShz6ytXSdjVOaFomqFa2uqO+DDFW5Rizre+aAHkt+0s9nJnfWDHk4Sk7QzgZifdY3y6WWQzODVfctD8/WiB1yKJme7UU7REn2WA5VlHmqC5e66rM9KsuZD4vb5XfLLOiJ8ThA= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR07MB11919.eurprd07.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(23010399003)(29003799003)(10067099003)(11063799006)(56012099006)(12006099003)(25016099003)(13003099007)(18002099003)(22082099003)(38070700021)(260925021311599003)(260925021911599003)(260925022911599003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?LQHyeFh0Scg4usZfwteuVNy00h+b?= =?utf-8?q?Db4L3gMaxm0D/U+O4W7FnAwHIolE2wYV6Pi10O+qehkJWcFC9DK9sOEfVXFDVUAgf?= =?utf-8?q?W880rjDEAvR5/P3/6ichnTnwyqfilfE9Hmae6IUP21+B/dvunGc26B4ll/2orLIhI?= =?utf-8?q?jartRNz7Bk5Y/nQfNTcZQYXT6ZMlMxai49Ar0CE8qtGv+W/FoUywc9d/IKZ0OXJMF?= =?utf-8?q?QhuA+m1/ZN2/NB+3qI2XgepE0VNzKKGyR3DqGrLzBZc2GvvCVvKQYKY7SCBmeA69w?= =?utf-8?q?nucxn2BdOKruCAEMT4fQBor2OrlZ1M1Gvldy8LjefiwnhQbVgaxLpVnXk4zssdeB6?= =?utf-8?q?o24zx9oXdbqBwQY10q8jg/0OO5gPxQrm/L0vD1eEhlF1C82FWeR4PNDS6gt+RXDzz?= =?utf-8?q?dBFZOd7apzwozhUj5d4AnGKB/+L7RJGPL5nap0m5AXru5NIBu1Jg/lszDxrlsN1BG?= =?utf-8?q?bPEQuYAaTlJ+5JxkGJx6Koz0etcW6P6wgpDKwD94duqZqD8bw/Yp4K6YBuRwcOQwH?= =?utf-8?q?BSLXzQmtSknBQtFPtdskh2Ptlhxtk3H/Ded+olNcroOSGAbdwy9xnPUqjh8roJzr6?= =?utf-8?q?KFeTDmeQGaWOXQL/TG7/FsFHmc72YMDqz6prCFx8F4SBDJVs2YROY26cmDQIyPL84?= =?utf-8?q?YXuORnKYeK4JdmZNLf6sU2iqfaZxzg0W+hMm5ZuuBZsi1RMTnfxYcbMAX9O2jbCSg?= =?utf-8?q?wQRwEf8QEBkvEO2KGYg4sed9bJPsEPkQ/rHo0i2IDtEz93qQG8WjQq8lOMgEjKlOA?= =?utf-8?q?z08UwzRcRL0CxirLNIs+JaX2B81H3+/wThq9JybZt6+QC0OWOVazmdMqz009MTJRg?= =?utf-8?q?PZO+Ri09kpC4drefydzQa2dKA77wYDfNcEJBINfdJFIT7baLaz6oJnsG7Mw4EjX9b?= =?utf-8?q?60BBgCADFmXL6K2sK0JX0O2Db2p5qI5meE9Dm2V+OxdbpD4qfmeda4+TzCwMlbs2s?= =?utf-8?q?ULc4JcVffeM/WQzVsX/DRJHVVsA83FvHy8+25kMd+/zWXQT45R6XKOsihZ0rzLgNk?= =?utf-8?q?mw776il3NZhqcfF2raWndEyE9TlPIInqzQatAMUVWX5LDYs63eoVyoVaHxWldNpTQ?= =?utf-8?q?Qs1uvnxSmbgYaGn1x1la7zlDu/LosEGwxL4Q0NFZaj8HoDONHoiqlehEGezeus62d?= =?utf-8?q?xrGXxEhdF02iIp3ibKj7vmD4/rQuXfv3Hk7Z/i1RUIIPYx6r+MvHleI2AAxLxAGpc?= =?utf-8?q?up4v9T1FI61W0ih/yhED4+4oka7vKz8+TpH+HlHT0rIqDS8RSTcMztRLi19Uld4x0?= =?utf-8?q?uJfymfLKOwwJ7Fzo/KD+2S3m4iilz+jph7NO8e4HUsMm/qOqLv2fDfxrdzzBJUfh1?= =?utf-8?q?RElBZ3AIYjpbiTwGbrc+qysVoDn7hCwa7rRljgy1+Sl9697RBDYyPlD/TSsHTFjsc?= =?utf-8?q?g4AkL41/jqh+Q/J6VZIkAnrnLhgZJN8xtAFrjq/FRfhk11mCM79eKkgvNc12BEOHd?= =?utf-8?q?Wg26LlD+v8brtpJnymXf7EQkbnzq3NP5AusL8OX/EQqAae2Vmdg368R6EqsTKDhXW?= =?utf-8?q?1NXrHmvClxQF5/Lzma4gVN1pIAOGhQHcvJ9TwD/TREvxAc2d3UJDOMBHwKO9MCRAE?= =?utf-8?q?KhfSrExdnN/gYK/7FPJ2/BkZ1DN+MCpyAWCQ3lH8pGmjMz73+YnrQLauRK5RQPUPF?= =?utf-8?q?xqgIQW56up+Mzy+vdPOXoTzHNmx2k2GQ=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: 9c66b089-ade8-4e66-6197-08df1e2a7e5e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:06:36.6878 (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: 6+I6tjxRMvF76BcJJuIoT+wuJO0xIUjZRqzPBtQIVKsX+x+ugs2F3dk8NI8prmoXfGcBdFwA1bgT7r9pRyjSCi36078CxbW/AfnkUi58+9k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7219 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:06:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246860 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.12.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..776733829a --- /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 64b85a2..1dff578 100644 +--- a/lib/pkcs11_write.c ++++ b/lib/pkcs11_write.c +@@ -1266,10 +1266,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; + } + +@@ -1290,9 +1289,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; +@@ -1324,6 +1325,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.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index bb3328b55e..f0696e500b 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -47,6 +47,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] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51" From patchwork Tue Sep 29 13:06:39 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: 99583 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 E3031CA5FAE for ; Tue, 29 Sep 2026 13:06:56 +0000 (UTC) Received: from AM0PR02CU008.outbound.protection.outlook.com (AM0PR02CU008.outbound.protection.outlook.com [52.101.72.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7357.1790687207044132166 for ; Tue, 29 Sep 2026 06:06:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=Q+Re/b7Z; 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.1, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FiaGRBjE+jS9+s6Ygtq7w6meo19KFMnVlJgl9uhZGoySDIxmMk3ig4GSy0OU5vku9R+e+ILcd6WCKJ2n7dMZl0Ss/PTTR2NHwGo5wQq1KqqI9vaIqmp+/dRnPYGX49um8P9InY1h+fiWRGPX0j45fZWis5qUNnfkAiz+RipTNMd17+wcy6WB0GAqbbkr2aKd6WDw50mNWzEaxVkpDPmC/oUD9bfGIV5Aze49uLGIKymbjdozYWZROrpmsUBX4bMtVVKtNmgr7znBZIA3EDan2lSTWaI+actEl+linMUIibLSBvc46Gjw9yHSFqlu6OqHsYoCWjfWO2JdnrEsusOWog== 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=8x8Ky4ZhnLgG3/8KIKQwEKg/04ToRNomMiusFu2uXtw=; b=AbrlaNRlGm4lV/x+P4ju0ecuUaAYvRzZR37ywRRAAkzvtIzsB9WU3uAshTjxyEgDtW1MIENmV2MLUv7qPtUp1WrCw+iXeDu8U0cTx8UZ+Hs4j27Dif5r3Od2IYAnOZyk0nXwGoqxNpDpwYVGqCH0FJjpCseUqzm5DewQgWoDQ5uCtqmooBwYwhYe11QUJg35Qd2JscAYRLZ/Fsh3v6ZF52WYJXnZnb6DF1yLn9Y5R+DEVuyuJKjjyPcaA6oY+4+wJtyx2Cxbp37T44XUQ2fJqfusPs8auDKMRQPfF7B4Lpr4ce4TYLY63oo22ZQi7XuDtIygk8jlqEXJplfAe5gT8A== 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=8x8Ky4ZhnLgG3/8KIKQwEKg/04ToRNomMiusFu2uXtw=; b=Q+Re/b7ZhnK9dJclfqYdoCr7Z3Gx6AOtxkgvI83/LUImazk8oxe7g0sjFYhbGkfyo9REZcaGFp9bANmBiu0KAK3Jkfl+dVTWKwcRzV+Pgf2QOEDb97mFjB15pmIW9DVdwjX3RtydMDiJT6BbqaIF6BndSLSE49qmln6sBrVJ7a+0itVjcakM1x6H5FKxy9XMVUZdVY/f31600molSFzgTZ3AOP8y2kFBxQb/wnIZVEFlNJ1Xg00PYxMZQgIQb64dNXBa44kIEzOpb2gm76fKWcJpON2Ne5NuvflalTLTsVSPl35YS7ZY0H1bRlvRwr4gUDjDoXp3bFT47oSrJLoB+g== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by PAXPR07MB7855.eurprd07.prod.outlook.com (2603:10a6:102:133::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:06: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.0451.022; Tue, 29 Sep 2026 13:06:39 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2 4/5] gnutls: fix CVE-2026-42015 Thread-Topic: [wrynose][PATCH v2 4/5] gnutls: fix CVE-2026-42015 Thread-Index: AQHdUBNdaffaZWRm+EOn2uHOZATWXA== Date: Tue, 29 Sep 2026 13:06:39 +0000 Message-ID: <20260929130622.246144-4-jakub.szczudlo@nokia.com> References: <20260929130622.246144-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929130622.246144-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_|PAXPR07MB7855:EE_ x-ms-office365-filtering-correlation-id: 34239177-1cae-44ea-df2e-08df1e2a7fe6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|23010399003|12006099003|18002099003|22082099003|13003099007|38070700021|10067099003|260925022911599003|260925021311599003|260925021911599003|56012099006|11063799006; x-microsoft-antispam-message-info: lXylZXe5rYFu0fXrFA3LvqvZtVdA9E2IO190yFIjkOJFlcfYu+cwjKzK8ICXqUBa8sA8KzZ4qJEmz1B0uO1OKT67EpUmDLyi6NqQBHSyxUxhP5tN6dnl1r2CLyDqE74ycVEQBuDEx567zV/YovXCCwnGiwC7oWj0ZrzeOFfv/70BMa0ayg0GYr/9HgP+SeJGPh19srNBPCuKJQHPHqtJjq9GhiIqiXYO9MGTSHlERJ6faR9JYekMrk80aawwiJWuqTtWsKBh7m59MdaYJK1WHp/45bq9buRxmNRNHTPmrSOQoLr20Go2sT5oxCxNoXJtpZyyZ4bys7Dd3r9xT2GmiihqvIISEaMuNKwo6WeHqAxJWuKyzi+gk0F1YrdC0xVR6w6GEwGOU8DGm+t6RQfa7zcquI5LNM6/X6fa6F6ZYOeyNkzxyOyBQZ6y5l13xhDnTdVYPJ5I8i00fSaS7+VRtNyLjcQGjZXFEklXc88+9CfYKPg4SfoDN1HLfYKNNoN15m2lXKWPX1Dzg0ZSpKBz2AnpACuTekL/XIjR2bMJ89AgvUhlIapLYbEI38GgQe8AHzQBtib21f5QLa5gcFQjpgLYH7MulHW89gRiYPkNowh3mmvqIZQ9/ZWQqA6IbCI0L+NTjTOvQY0mkVFwpHAfzFFPoqI9/baDihIJ1T07sb4= 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)(376014)(366016)(1800799024)(23010399003)(12006099003)(18002099003)(22082099003)(13003099007)(38070700021)(10067099003)(260925022911599003)(260925021311599003)(260925021911599003)(56012099006)(11063799006);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?spRBO6RI0p4Z2cmY3xtOltgVUf/A?= =?utf-8?q?mdHNAw8DzGRhtsLz9hn/8uKX9o12nY+rvPqJymfCYM1qKJT2osyzv01pARnRgZ3Xn?= =?utf-8?q?b/1SmTm+mDxoXn+OS6HfZa7cPEVbLL5DVf6/YJSXTwZiqzXx/CuIEHJMq9pH0inGy?= =?utf-8?q?x9OZFX6ZuYyIaPpKB6oJOFD5IWRs8/N3VaXKoD24YETt8oBXNsyTFBOADasmD/5VF?= =?utf-8?q?O2JdqW4BYVkAnfqRbwyH6xPhS9SM9tVJIqfFp0iarA7cxKya0ZqVqEdtxe9CrV8UN?= =?utf-8?q?8hzHyyzUZUezJt7Gy/PcvJ+XseeyXvwhTb9De9HlGgppf3U+6XNTwoUK8uXti2VGH?= =?utf-8?q?XH0IlqksMemQVJV1g2rBhhqxTl+L0RhxzMfPwaKhAuIe1r6WmY+bOJRNJfVs7l4aH?= =?utf-8?q?Bdp4bEkcX6v0Co25mUhYMeibBS526dOZd9Tc083+fILwdaz8XWoBPLFqyHJnFG0f5?= =?utf-8?q?uKjbNF1V83xe3WlKL4HDezJBwVGtT6ZxM0lCOn8ukqkHXd39Xz8zgF2G7dTtIMWPX?= =?utf-8?q?xsrEFBf/i8NeYiIWSwUI9KTjC9hggLWZ4YyHCbuqaPHn0BwETkSd/BeyzuDFLt/R7?= =?utf-8?q?1tzYSxFwvr7x+OcUMsHkuYPa4xRnLnscTLXGozKDNz8ZIWJWIWcUYErG3Ph8Q+7c6?= =?utf-8?q?+xY+0bbz0vgosj+r52GoZTw5zkh3aN1ceRs1Z0RSfbGtmPcyYpvNFWnbqcPdfNUgT?= =?utf-8?q?Q1n9UE5Y/KkwJ32VYvWKzmQpWyIPpdemmb3oPA1r+TJpk4teQq6unIEX1lVYykdTQ?= =?utf-8?q?NEN3qe3orLUn/c5fuWz/QnLBmQ6MhjXd8pBrqhkZuDNcamsjEwmY+gPJTlLg7Fd5v?= =?utf-8?q?p9OeFsV1WeWkDCBPqYejoX/xQxnsbnG0hCtjYNOHkXhkZ48rr5anuFurAIbBldSCt?= =?utf-8?q?W/ktEs9ajlqFcq9kyhPDP5vr7j6r/97XHaAEfmKbPWIf6zNNkecyfTPCNYNAuGab4?= =?utf-8?q?B8XQNQa52L4/FHnQ1WBrwpf8sjneUGlOVoTBJFQgyEaP6KnKDU+fQ4Hp69d49sYwW?= =?utf-8?q?N4i9zvWsZhbKagH5vLsFYHIvt0yZNfAohqqJuCQJ9HXOO1u2L6LVLOG3LsMedFurm?= =?utf-8?q?vybx1LW9WMZPswUQUBH2XwnfM4arM6JosKD2SIxBxyqMIsKMQwW3JtktkgkSG5N8V?= =?utf-8?q?X58sMQ7Z8Fo0YNiMImNeqh1LjshoyF6CCrdWSNWU7i4jaZOdaAD7FKispEbFOAm3B?= =?utf-8?q?0BRX7/YoAYfd9HGWsMnwzGBp5Imed51ynzhLRgbOSZ954NiM84qo1PMQnGSxkVj5T?= =?utf-8?q?afMzZ2ylIZFQT6GHQmcCKspl0vhVATqsZliu75xmcl6kKKiVULIXMdfdrWYbrt+mM?= =?utf-8?q?zEIiTahfWXufXnIapoNtEr2ASOaqMMVt7kcHMlbloc98ysO2M2VL47TnbG43XDuhS?= =?utf-8?q?WOCASdtmodhqMI01Ug13+zUsl0J3ZBsS78W1CpquI1EjHtM6/47K0fYED2GL6a5wY?= =?utf-8?q?Ku8i1pXNJcm1nxDxcy2EinZaZtqV9kK3GydCTWbgJbAzanpfGu39lJY5ad2C78y+7?= =?utf-8?q?fyOlwPsJyUnCDvxpIdGJf3NM4QsefLXc4HqOgFzCHFCPpWv4WRl0R8o4iOxGyoWEZ?= =?utf-8?q?Al4LPpoUaM47+9oT6YHi3lvxxpgPh5USubI0jkq/ng+9Fh6p6NDnpF0zr3t4dguQX?= =?utf-8?q?oKkeC0KeaNw4t+wDQYO1tp/riVMj0XSA=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: 34239177-1cae-44ea-df2e-08df1e2a7fe6 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:06:39.3140 (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: pr+YoCagpur2166iDgDo976wYquELCBeURHytw3PNSIL7oIX7lCEytca8LxOesMg8bBtplrtteGWWywAy7Bq7iahCJHCzFjRE7GqpcczagA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR07MB7855 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246861 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.12.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.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index f0696e500b..81fb880c45 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -48,6 +48,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] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51" From patchwork Tue Sep 29 13:06:41 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: 99582 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 D1A2FCA5FA5 for ; Tue, 29 Sep 2026 13:06:56 +0000 (UTC) Received: from GVXPR05CU001.outbound.protection.outlook.com (GVXPR05CU001.outbound.protection.outlook.com [52.101.83.55]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7398.1790687212539279871 for ; Tue, 29 Sep 2026 06:06:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=sIXeJLkk; 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.55, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wdG6uJmctVPQ3WphEo+/tlFq2uDDPzYBBqkXBtE9u0x1jYBlQU8+SL8vtw/28YpjRVJWEZolwDaORJd6pVp86Q30TBVq9uiOPEgQ7zhKCA7wFE5MJf0COC3oUMaZp2buZtcmEkbbpZDJX9Hq7zTvUUZm7OKKRSmKG9Y9U01cjv5p6Wcx/CtNrpcGlR6YSfld5yBqchHrIPnUSnyd8EMB2B+MigXKyUON9G+ltrfg1j6uKDa/kHINpnoRCT5zSd/KLrZWKhUrXOMGUaweDBAnvE+wF+ffsqqPEfGVfHsWu5GC7FHSlrAsLc02IrHL3L96Ak5M2IeM3tmI0vsmP5UGfg== 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=8yLwOGLGLg/9X9YfPpxWdu8lhLZhnLJ6oS9MQzvz3GQ=; b=ukIRTOpwW8FFuzqbLiCCpK2Im4S3Lm4HFc6OFAEIW/nWMN3cD6b4kd+CDXnqootJSu6rJE4VrvPqrM3I/UJbjEh3d4FevBrIdG6NDNxkCH1eHTO0cn+iMg77UhugBTU0rG09tFNdi2t+S1oc/kq46P7lO1R2vD6gIzLrIM89SAR9BMwWswjRxpMfkj9dKengKd+QUWOOARAfmP+WDasx6Ij6NqKMVyoMskaGQh6hSJcV39M0X5cvWFGGuNrC1NXMyCQD7Jx0DjsSE/ya4AkfMqf3/yyTke+tBkwogF4B9Hz+lhFHRwJDlshIBi4H4s+goWtc3/jsEIW6dPkTs+A95w== 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=8yLwOGLGLg/9X9YfPpxWdu8lhLZhnLJ6oS9MQzvz3GQ=; b=sIXeJLkkUccZAnqWJNDEh4pdvcs55mM8u2gPB4KlvWGfk628D3wxBWzrKjnN5hV+jxNli/CR5GPAap0E5uxPyn/pDYNMs/4NROr9PMrI4FMyQw65F014vXvIgHU8IodYagJDSYsq7wVJEMAIQ9Ib0kPc2YFOn0QBG1K5FSpzJwMeXIFB2kWIAQ9SvdTQrmxOL0iCSHywLNVNpxbh8tfZ/6MRkBTA5750CyUfZ6NK50sKJtVvh2oXLIzGOo82u1KztuuAKaRCLp7IJOP25hQjUlCegOhZQoVbsPjD0NL11uBM8Vx/SH2imApT8z+wQCy8ntfZqDNi4yOU4N5hMQCj6A== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by VI2PR07MB10179.eurprd07.prod.outlook.com (2603:10a6:800:277::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.24; Tue, 29 Sep 2026 13:06:43 +0000 Received: from GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680]) by GV2PR07MB11919.eurprd07.prod.outlook.com ([fe80::159a:9a82:1362:e680%3]) with mapi id 15.21.0451.022; Tue, 29 Sep 2026 13:06:43 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2 5/5] gnutls: fix CVE-2026-5260 Thread-Topic: [wrynose][PATCH v2 5/5] gnutls: fix CVE-2026-5260 Thread-Index: AQHdUBNfBYUOQGpq4EOEuy1KbEvfgQ== Date: Tue, 29 Sep 2026 13:06:41 +0000 Message-ID: <20260929130622.246144-5-jakub.szczudlo@nokia.com> References: <20260929130622.246144-1-jakub.szczudlo@nokia.com> In-Reply-To: <20260929130622.246144-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_|VI2PR07MB10179:EE_ x-ms-office365-filtering-correlation-id: 5eabfc96-1f56-4b5d-9e04-08df1e2a8230 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|23010399003|1800799024|10067099003|11063799006|56012099006|260925021311599003|260925022911599003|260925021911599003|6133799003|25016099003|12006099003|29003799003|13003099007|18002099003|22082099003|38070700021; x-microsoft-antispam-message-info: QxfM/RCe+Imnav6ByfMPAN/I7LxqH0eKed422U0n6wdZNwP5WvmrDHHLmAx1xCTM8Pyyw8CTtoKbAWDXLKai8pCX+J0ws8VmHQ8iB5jJsPqdUY/DGW00wMG97CDJaryiPS4TFJvXut9xnGmDNg9Ma4vBcEjMfRD6jl+M+YNizhXaaofaLj3DF6k+vsh0pijaF8brWMtzfkdVS9WgZwfQElriGjWEL6L0fspR3LcDxAXP3i38qi141iaQbRdRUElsu7LyqqmhOhfj9rER1+V3XK8CRSxknR9sunCn+RIL7Zdhi7utOv34jCeesoQoS71KH2vSaIY/jmZWFlkilcKlYnRELC76rFt1cY50CHpeNPqOos7MhrXqA3+R7pNvSy9QGKDZSCnPUqksRhgyEgmpdbAlpeM5xDwjSeLlD0rG7RqnJdVTt8SIezgHL6qZ+/agiI6b6ggwErNAfJW9UQolSG/d5LKVK7WLF0D0dfSNyjU/3gZS/1zo04zttjaH39r+P3DJreSZFuKcOMfeHDWFjev5kdzjHME/U+3VzEYn6iOuW0BWvOu5YkEklrSmBGaCNLdzxj4iqnxgh+lJXzXOZxm5FYjYFcp9yRr6mMW+JTC+RKuth6/D7QA7YdO/CwIpmXr58fIC5QTj2DxqHl2TInsCECnke1i+xVbZrOaJvOM= 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)(376014)(366016)(23010399003)(1800799024)(10067099003)(11063799006)(56012099006)(260925021311599003)(260925022911599003)(260925021911599003)(6133799003)(25016099003)(12006099003)(29003799003)(13003099007)(18002099003)(22082099003)(38070700021);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?pd2kyX72tq+IIKxfZR0ibeJ4fTyL?= =?utf-8?q?t+qAdffn0ws2h1XLDKPmO0kv7zyZTIYTb6ciUZOFAUGwxeEm7s4aK93AQsz6upDNU?= =?utf-8?q?5lb4fjRsDwmxtIxN9+kh4wvxqsrJA5+6xsJ7XDNkALL6h7fSmQ/jveqhQmUYOP4up?= =?utf-8?q?2bUcFryEw+at4bw9DEypL+zWrZOidVAgE0Pc0S7g6iljGe2wuaHUDHDgCI3d3v3DB?= =?utf-8?q?/pQ1TgCLJcgMWTs5QV7Wmjk0LJwcVpw6cDYmsaGupl8q3F0B+gDGSgFJufVTlNEv1?= =?utf-8?q?28wcyyUMBEiVVFf1sxS+EEXEpwc8og0cJRywz+tM6APfEs9EIyocHWc/4FZ7163GW?= =?utf-8?q?ppJ3CohcgH0UwUfleud2ctmkC8b358PqXhmN/nZ14j+H/ngUbRXVO9icW1l9rdl1j?= =?utf-8?q?rSd7TIMKM6x523Nt7pPCl84Gc57sqtcCdcZXLogg9Oe8U/GonuxjqH7B4KOyDdHGv?= =?utf-8?q?dTU0RY6Ddq8gfc0o9T/g5r1gapULItoubmfS2iicy2zfowk7Yqz9ENkKKGh2LUAyn?= =?utf-8?q?L61pj2TjGKUgyZtgvV0ozcr1DDNgBoOWVLEPD1Yc1l0iJWS56NLEJ3zRc6d4FkEyv?= =?utf-8?q?BZzoZTWlw/iZrs5pcHGpc5ahaEk3nN8IASF0ia4nYaxWF1hQAiRMwbw7zhaBeLtpS?= =?utf-8?q?buP3WWXP+lQ6SUbBpnDIa9t6cfxTsDO2XLqCDm9HjIPmWpBz1jj+h9/y01R/I6Hhh?= =?utf-8?q?S1g7TnGijFAcBBNeZLTV6rTUstiZao2siaqHTzT6Zux7YEpKu0KOsRHD2nhqMFqO8?= =?utf-8?q?HbUxaoURkH4r4/6zop+9ELdxRvJGdPrwnpVSWYdfvzXSocbkqU0rRSpPct5XZmRnT?= =?utf-8?q?BLlw/OiqBLOqHHZcQkuj+/GxfCFU2htJ3phepRqnsVvtRbZynvlx6UYrOrFFgJPOQ?= =?utf-8?q?KM1vQP7uuXWjTi8rm25VJfJZ5IIi0S8D8twn9U+JvxSaheee5Jmm4b67SigQL3aer?= =?utf-8?q?Jni2Bx3yU3CdBw4puCnZe93CNVmTMBlM+EFuAM9/Ixs+nhiQfqUn1VaCBQFx+ag2D?= =?utf-8?q?tpQUnbxthzSayVZ2pR6echqTjYI27nEX3OauCq3CTX3m9ah5hCrhmNnS4LtloKRAk?= =?utf-8?q?S6QXFiRgbBwWr2jP43RruzEpHBsapKgD9snXYYM/FBGgsYsFhlgwtfSAS3Qe0Zb0T?= =?utf-8?q?vVT6hZXL24Nxhww2cbSY/6rJgc7atV3cQ9EGBZSf6SOFpN4E4EE5bicUywq11p0w9?= =?utf-8?q?ICZUMOizT7ssv5GfS8MWZ9HswLJOuYD8tgFfeE3ANRZ6CktZCNCnUstLeGcV9cJUH?= =?utf-8?q?QiYxx2yjpF8NalvlMDLwEocaWwqz+265Kma7dSi+068n29WHPIj/JTgwFAMiCEINe?= =?utf-8?q?/QKt1OeHQv+2GHAFR+Wl5kH2Qz2gXO5hbqtts0HW2NgGEfkqIK/gnhrRkQeitImqK?= =?utf-8?q?0wgS20oys0Of/6YujSyR6d33jt6w/WSeVyD2mCabvZxh5HQ18IhVBMn/JnhXf1jbR?= =?utf-8?q?kBAwHBtE/QU+jUF9R592ENmdJEk8uRIKT6WTU2wiWRTlRWzleJjxHQHuZfdmeBEmh?= =?utf-8?q?mSHE88SyLnil1EYnW810/1aLskJsi/wc3Lt4VgdHeUze2KOT0psVEndeT3rKWNrpL?= =?utf-8?q?/sHsQzDakuEhHtwUgZw7BhtLAuvCJmrrk393LJdRieVUXS54VF93JFT6BwWrFbGGW?= =?utf-8?q?3qF60cK3ABej9mcpWNDLDqF+A88otmOg=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: 5eabfc96-1f56-4b5d-9e04-08df1e2a8230 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2026 13:06:41.9532 (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: FHl6v9fNHZ3Vgd0WQpNy3zk+UmMkI317HxprkvPZLey2TUgmtVHWuhCIG1vIoJRcrcu7mpw2LNSe8U59WtZOFWCCmmevfT7Ad1KZlOnYRpM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR07MB10179 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 29 Sep 2026 13:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/246862 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.12.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..c5ab814031 --- /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 4d18132..496c378 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 cc92b4a..dba4011 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..67154164c5 --- /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 568474e..e133c49 100644 +--- a/lib/pkcs11_privkey.c ++++ b/lib/pkcs11_privkey.c +@@ -838,7 +838,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.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index 81fb880c45..9247fbfc3c 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -49,6 +49,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] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51"