From patchwork Wed Sep 9 07:37:09 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: 97702 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 939F2C79F8C for ; Wed, 9 Sep 2026 07:37:15 +0000 (UTC) Received: from OSPPR02CU001.outbound.protection.outlook.com (OSPPR02CU001.outbound.protection.outlook.com [40.107.159.30]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.6416.1788939434350194813 for ; Wed, 09 Sep 2026 00:37:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=p6SrL7b7; 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.30, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nj39bqKZMAmI7s5XKi6yal97cHnte2c0hdj6KajOg38lGGVB5C2Gvu4cEP/TFNiVwWDxa6X6bDBmU8BzKUQVf2EJ4ADclvb0WRxBSV7ZHacwfkbxnjYLYxc/071noaqRaqwiXiRl+Ymulr2onHeX7cyFe6hkLgKhxIHemrd+UNOtBkueuSy44o8DdsuBr7os5vHsGsik3o0YG3pLm3UOTOBKlV4JBKK8krRcPwLfFjU3IIQTL7uOKLGg5Ndch65odLHifFp/H4Wa4bzl9KfAZsRxMqCu7LsVYaD3o9yNm4UDUGZCcjxMkxs+89ppc/zSxTHa/ugZULRVX52r+kLc3w== 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=tkl9Zkga0VwCgmjhxwYSQOrf0Y5QaqU80wr1iLQDTnc=; b=CIaSgPKl++AZHONStFheQfLNesb4gexNtNUDlPiejKYOe57/c6Bmztv7wajowqeRnu7bTIOBovfesc9l3+kdXOzAgbeeax+e6rmstwOr0jO794ir0Mhxn/skEJdhTlEs62psdHWPLUChPkI3cGgrS3jdyqNLR4R1FA3Io9ryUW/3xjbSa37uIW8RhI8ZqtT2SZSaXE8A8rr27ie1WyViQJJwyB/xPQx01175FXb8orp9FPsUi8TyU5w0SlNK6SH/OedYw/BLd3XIbksyTKC4puUXTzH/NjTduIJOmCjCwOmB9PlyC2PAD3jwBiUbP/wWaHZ3WO3zreeKoz5SYhS/YA== 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=tkl9Zkga0VwCgmjhxwYSQOrf0Y5QaqU80wr1iLQDTnc=; b=p6SrL7b7TaPp1yPUBNzskvm0gr6EopMXmJ59HOamQ2RlYhM8bgtNN+NJX08P+KndXsvb+36++/teMuUnFux1mYcazmdvUe7oHKbHAvAmH6Y7qPcL6RFJGq3WeXv1sg49XAzrmNT7HaMLEJfrri5HYsoTJX44ozqmjBhNDchhebc6UH/D3DBrCyTm4u9Osk8uSz0lBraqRPo4gy3GTlCCD+aAorF1TJmz+4ooqP2UnRwROXnxwBvyZr8FImglk7Z2fpBtXg1Z+Ffzmke4UnKiKslP6kfYTWLENLwbicOu6fq64te9UmuRAgilLdGuGoogass0YbHRBmtVPPGAvB2N/w== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by OSKPR07MB10303.eurprd07.prod.outlook.com (2603:10a6:e10:99::16) 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 07:37:09 +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 07:37:09 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [wrynose][PATCH v2] gnutls: fix CVE-2026-5419 Thread-Topic: [wrynose][PATCH v2] gnutls: fix CVE-2026-5419 Thread-Index: AQHdQC4FUWY4Qec7O0qfz49yp9GI8Q== Date: Wed, 9 Sep 2026 07:37:09 +0000 Message-ID: <20260909073704.15560-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: 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_|OSKPR07MB10303:EE_ x-ms-office365-filtering-correlation-id: 5cbfac2d-9d91-4c99-1a50-08df0e4527e2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|23010399003|1800799024|13003099007|38070700021|10067099003|56012099006|5023799004|11063799006|18002099003|12006099003; x-microsoft-antispam-message-info: wIk14IMkF9NUvpoCI3lSBAw89D/O0PYM7X3p22oxJKLvHmDQlhDDTZzJcwkPeVMuVP4eY7aZU9uyk7EpoyXspVumW8cJZg6aLKDsrjxhF0DuWi/7jelRrDQPaT/wPqYTEexVKk4xKmsnzeYitwxnLkbfz5HHOKfVg6v0C5VNVP3XhB8D9+WavV/CvH2886RWq00VRcLVk5c70SX9uE9lhq87j3vGwIm/fKt8voQA1yaQt9ITUuCWprstfePuhA6jMqa0prbgqNvc5CmLeEMJpP4feJy3pc6NLwmFZuVcFYAEcF3dA4dTRC+NpDGWutyT1Hm3XSKsHUxG9kbvMR+6qLvSOEu+CDzUN1RcjPerDsI/1as7Wzgv0yGVFNDZC64AI6Xo5Z6+bJ8eoVshqPHdwqUMwZXNnrC9gjoWnrbfc4c4MHw+UvNlxiVaJ0HRzIgF535ijQv2FZ4xdjqIZ7uYp23gmO2ogjZ8JMY2GZ0W1uiVeLMWTx1oKOrMcTSE3zbayeeu+6Vdlmt/bxx/eUjO9YdLI7Ixvosg1ltghEc+2Cq1vAWvZkGBhnjI8KDPmdvYgtUT21BOoex3w0aN81KCGdWWShUCgfpcyzFGC1FoNejwhKvkyyFQRvoaADMEtOw5qOTC3hTMAhtqs91Zgai80Bg+WlhWFm+510+o0R97YIJo8uE/g1yVkNXw5abqdYAzbTQDEb8JjoPs4yfTqZykexMaYjULPqBA43ATIp4Xfqo= 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)(13003099007)(38070700021)(10067099003)(56012099006)(5023799004)(11063799006)(18002099003)(12006099003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?d7OjLRRQuXIkDN0IVNZiQT6?= =?iso-8859-1?q?1S6uKayRjwIO7ZO4+UTAVwZrstO9g8SuqHKdTAlRz8E2VRd9xBHUj5sq2OBB?= =?iso-8859-1?q?/psStU8owLBtCDJ7rgvT4O0zdzEgWQtTYVgwJQSu666B4qm7Gw5cH0kkdKg6?= =?iso-8859-1?q?M3YCs+fSrnVwQHjiipwQA+7SsVsmaN3pqa8SGipQXvF2TroP87V6hDnUZGyH?= =?iso-8859-1?q?kjg2ihx4J6eWSeoplFa4qu68tbsBY6rFMqyCamkmztvScW34A5foeNRhcCF3?= =?iso-8859-1?q?2TGs4okbYjOgP98tIXy+l2fqRPA+azmsz12LYxXwJ7NlbkHAnzGyPgpC145F?= =?iso-8859-1?q?kDQQ1Cw+zhgrWJE+ssSJlMQ+gNOdfV2juw2o0IAWQDiRb2psA5clJGQ1cRu9?= =?iso-8859-1?q?BG5oNiJkDjHEg14DchRs8erPhAN3IYFemCkTpPe67gPTvxiMNGwL6s1lFJMT?= =?iso-8859-1?q?XHq7zbagYOYdVBKXZVp+gsDbVbCya0rPYoZ4Ep8TTBTNDSqCNn39i61pnWJK?= =?iso-8859-1?q?8mRy83SKIwpl0cyx6PiW3zB7aXP4eO+kj6HyWBWSwIre1Ix/4wAf1+79lWy7?= =?iso-8859-1?q?m6eY1qM5XvzzPfsmDUFjWRIFsTExLoqFGdiJvj5HQk7C2tgLEqhCdxfFMU9F?= =?iso-8859-1?q?rwqiK87Ai3HZOUFLuc1n37MNMJ/Us5h5QxQKNH8qfpmSac1GQTeWOfYR8y2k?= =?iso-8859-1?q?YnNqi7iEgr0UgbpZdGnx7DfQikDofutNtFnKOhwCiRUwCwiTsg1A8iIisoxE?= =?iso-8859-1?q?CXyqiuuycgAW2a7B+PBDZf7PKpaBnIvxlcvL+T5mm6NwGTJInjX0BFaUQNDn?= =?iso-8859-1?q?BewtICEuKDV/cAtParNweo8WkGX74EH12wg2xNYYJXu7UrfDsNueO59UAugf?= =?iso-8859-1?q?KTTUsOQ+fyGhK4c3AmFs9pQZiX44ppoOyiert21YvJn0Wk7Pcv+z2pQPHbXz?= =?iso-8859-1?q?HvGKKHEPiesAOPcPBWEF9Lymot2YUwuhP4u4IFej1/g7BhToxvxenEFQLbTy?= =?iso-8859-1?q?ANseIz0IvRTOYEiRhvprEIQf6EUeGPIKmkLg/SRb8MO/o0Dsl3cN+DROk3D+?= =?iso-8859-1?q?4/Y58Q6jT04jiWkgV5XdqM9/kxDElJwSuEctfQ8dqCoMroIFK75GNX/PI+xZ?= =?iso-8859-1?q?vyr05siY0Ud3w/7welIzCeZTY0AfgTQsI/jiU6tPkBwEoBXndrwyGKEpeA74?= =?iso-8859-1?q?VOGM76WTlMKfv9RfzNDIfDkeI0bS3O8UeRvlvkDieX6FHy4YFc7PDiI7k5y8?= =?iso-8859-1?q?Rn7iN30SdAU2m09k5pOeL6xWZtR3Ve1bYuXZdNCFSYPWgf0+UZZ+8MoK4kq5?= =?iso-8859-1?q?+v++XHL9aH7g1By1pRRBni9z8GWdowiSRsQR3S0tHwKPgHLKcWiA149aSVoV?= =?iso-8859-1?q?QOIzDWuZQU4HZQM2wp/DUdJLp+k7SggIjZag/rv+fBcHQHuYmmrZBJOQDt0E?= =?iso-8859-1?q?yxZ/y47Hom5UwYuRXoECsREb8WKDmkbI9mFOhvImRthZ87BU/6d17DzXOAHD?= =?iso-8859-1?q?2Z/YoaxroFJLdLWwkx3Xt30f59IS3u/RvB/CJR4Rzq3VbuGJy0fH2upogH7o?= =?iso-8859-1?q?weYRzQYVZRwEO5UmcgxNstAo609T+wXXD//IijUbA4AZqep+U2QVeao5wqxh?= =?iso-8859-1?q?vtxpQC+EHXUh3OFldbarQ/+7ouzePpbMZtJnbD6gtvIaHAffn9vGWuMo24nl?= =?iso-8859-1?q?lZeMH3PoVPbBkQx7VkNberPv4OBbx3RYdNDLU9N6Cm12Zg1ycwiK31RVhpRX?= =?iso-8859-1?q?RhhqbAcH+2VmdEOXglcJyAUoHB7zqxBGF81StLM5M9XRhgQ=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: 5cbfac2d-9d91-4c99-1a50-08df0e4527e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 07:37:09.3311 (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: IH1tAkfF4nbBwgprUtbp1vUrENelpFydUBacaqLbwYPkWXK2Gyf60ed5R0Hc02Q27BgT8+CyajmRLGcE8jgtlMYLtTplXGpngAx3XKNFWqY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSKPR07MB10303 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 07:37:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245448 Backport patch to fix CVE-2026-5419. References: https://nvd.nist.gov/vuln/detail/CVE-2026-5419 Upstream fix: https://gitlab.com/gnutls/gnutls/-/commit/1e627aa5ad95c6dc0518d94e9a009997b081a1ab Tested with ptes Signed-off-by: Jakub Szczudlo --- v2: - delete unneeded spaces from function _gnutls_pkcs7_unpad .../gnutls/gnutls/CVE-2026-5419.patch | 247 ++++++++++++++++++ meta/recipes-support/gnutls/gnutls_3.8.12.bb | 1 + 2 files changed, 248 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2026-5419.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2026-5419.patch b/meta/recipes-support/gnutls/gnutls/CVE-2026-5419.patch new file mode 100644 index 0000000000..f75aff35db --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-5419.patch @@ -0,0 +1,247 @@ +From 2f3732538d7d8e1ae255ca68c20efc61a1d5b3e2 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 4 Sep 2026 09:17:32 +0000 +Subject: [PATCH] gnutls_cipher_decrypt3: make PKCS#7 unpadding branch free + +This tries to make the logic of PKCS#7 padding removal constant-time, +by removing potential branching operations. + +CVE: CVE-2026-5419 +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/1e627aa5ad95c6dc0518d94e9a009997b081a1ab] + +Backport Changes: +- Adjusted the upstream hunk to match the GnuTLS 3.8.12 code layout. +- Drop .gitignore from the backport. + +Reported-by: Doria Tang of Stony Brook University +Fixes: #1815 +Fixes: CVE-2026-5419 +Fixes: GNUTLS-SA-2026-04-29-13 +CVSS: 3.7 Low CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:N/A:N +Signed-off-by: Daiki Ueno +Signed-off-by: Jakub Szczudlo + +--- + lib/crypto-api.c | 53 ++++++++++++++++------ + lib/libgnutls.map | 2 + + tests/Makefile.am | 2 +- + tests/pkcs7-pad.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 152 insertions(+), 14 deletions(-) + create mode 100644 tests/pkcs7-pad.c + +diff --git a/lib/crypto-api.c b/lib/crypto-api.c +index 01539d5..7749fcd 100644 +--- a/lib/crypto-api.c ++++ b/lib/crypto-api.c +@@ -497,6 +497,38 @@ error: + } + return ret; + } ++/* If succeeds, returns the number of padding bytes to be removed; ++ * zero otherwise. ++ */ ++unsigned int _gnutls_pkcs7_unpad(const uint8_t *block, unsigned int block_size) ++{ ++ uint8_t padding = block[block_size - 1]; ++ volatile unsigned int mask = ~0; ++ volatile unsigned int count = 0; ++ ++ /* Count consecutive PADDING bytes from the end, in a ++ * constant-time manner. ++ */ ++ for (size_t i = block_size; i > 0; i--) { ++ volatile unsigned int mask2; ++ ++ mask2 = -(unsigned int)(block[i - 1] == padding); ++ mask2 &= -(unsigned int)(count < padding); ++ ++ /* MASK is initially ~0 and will be flipped to 0 upon first ++ * non-padding bytes. ++ */ ++ mask &= mask2; ++ count += 1 & mask; ++ } ++ ++ /* PADDING == 0 is effectively excluded here, given COUNT ++ * will never be 0. ++ */ ++ mask = -(unsigned int)(count <= block_size); ++ mask &= -(unsigned int)(count == padding); ++ return count & mask; ++} + + /** + * gnutls_cipher_decrypt3: +@@ -532,22 +564,17 @@ int gnutls_cipher_decrypt3(gnutls_cipher_hd_t handle, const void *ctext, + if (_gnutls_cipher_type(h->ctx_enc.e) == CIPHER_BLOCK && + (flags & GNUTLS_CIPHER_PADDING_PKCS7)) { + uint8_t *p = ptext; +- uint8_t padding = p[*ptext_len - 1]; +- if (!padding || +- padding > _gnutls_cipher_get_block_size(h->ctx_enc.e)) { +- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); +- } +- /* Check that the prior bytes are all PADDING */ +- for (size_t i = *ptext_len - padding; i < *ptext_len; i++) { +- if (padding != p[*ptext_len - 1]) { +- return gnutls_assert_val( +- GNUTLS_E_DECRYPTION_FAILED); +- } +- } ++ size_t block_size = _gnutls_cipher_get_block_size(h->ctx_enc.e); ++ uint8_t *block = &p[*ptext_len - block_size]; ++ unsigned int padding = _gnutls_pkcs7_unpad(block, block_size); ++ volatile unsigned int mask; ++ ++ mask = -(unsigned int)(padding == 0); ++ ret = GNUTLS_E_DECRYPTION_FAILED & mask; + *ptext_len -= padding; + } + +- return 0; ++ return ret; + } + + /** +diff --git a/lib/libgnutls.map b/lib/libgnutls.map +index 955704e..5cc12c8 100644 +--- a/lib/libgnutls.map ++++ b/lib/libgnutls.map +@@ -1574,4 +1574,6 @@ GNUTLS_PRIVATE_3_4 { + _gnutls_pathbuf_append; + _gnutls_pathbuf_truncate; + _gnutls_pathbuf_deinit; ++ # needed by tests/pkcs7-pad ++ _gnutls_pkcs7_unpad; + } GNUTLS_3_4; +diff --git a/tests/Makefile.am b/tests/Makefile.am +index ab2685c..1304d2f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -241,7 +241,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei + x509cert-dntypes id-on-xmppAddr tls13-compat-mode ciphersuite-name \ + x509-upnconstraint xts-key-check cipher-padding pkcs7-verify-double-free \ + fips-rsa-sizes tls12-rehandshake-ticket pathbuf tls-force-ems \ +- psk-importer privkey-derive dh-compute2 ecdh-compute2 \ ++ psk-importer privkey-derive dh-compute2 ecdh-compute2 pkcs7-pad \ + mini-dtls-fragments + + ctests += tls-channel-binding +diff --git a/tests/pkcs7-pad.c b/tests/pkcs7-pad.c +new file mode 100644 +index 0000000..d4c3798 +--- /dev/null ++++ b/tests/pkcs7-pad.c +@@ -0,0 +1,109 @@ ++/* ++ * Copyright (C) 2026 Red Hat, Inc. ++ * ++ * This file is part of GnuTLS. ++ * ++ * GnuTLS is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GnuTLS is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GnuTLS. If not, see . ++ */ ++ ++/* Test that _gnutls_pkcs7_unpad is branch-free, using valgrind */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include ++#include ++ ++#ifdef HAVE_VALGRIND_MEMCHECK_H ++#include ++#endif ++ ++#include "utils.h" ++ ++static inline void _gnutls_memory_mark_undefined(void *addr, size_t size) ++{ ++#ifdef HAVE_VALGRIND_MEMCHECK_H ++ if (RUNNING_ON_VALGRIND) ++ VALGRIND_MAKE_MEM_UNDEFINED(addr, size); ++#endif ++} ++ ++static inline void _gnutls_memory_mark_defined(void *addr, size_t size) ++{ ++#ifdef HAVE_VALGRIND_MEMCHECK_H ++ if (RUNNING_ON_VALGRIND) ++ VALGRIND_MAKE_MEM_DEFINED(addr, size); ++#endif ++} ++ ++extern unsigned int _gnutls_pkcs7_unpad(const uint8_t *block, ++ unsigned int block_size); ++ ++static unsigned int wrap_pkcs7_unpad(uint8_t *block, unsigned int block_size) ++{ ++ unsigned int padding; ++ ++ _gnutls_memory_mark_undefined(block, block_size); ++ ++ padding = _gnutls_pkcs7_unpad(block, block_size); ++ ++ _gnutls_memory_mark_defined(block, block_size); ++ _gnutls_memory_mark_defined(&padding, sizeof(padding)); ++ ++ return padding; ++} ++ ++#define PAD 5 ++ ++void doit(void) ++{ ++ uint8_t block[16]; ++ unsigned int padding; ++ ++ memset(block, 0xFF, sizeof(block)); ++ memset(&block[sizeof(block) - PAD], PAD, PAD); ++ ++ padding = wrap_pkcs7_unpad(block, sizeof(block)); ++ if (padding != PAD) ++ fail("padding should be %d\n", PAD); ++ ++ /* The last padding byte exceeds the block size */ ++ block[sizeof(block) - 1] = sizeof(block) + 1; ++ padding = wrap_pkcs7_unpad(block, sizeof(block)); ++ if (padding != 0) ++ fail("padding should be 0\n"); ++ block[sizeof(block) - 1] = PAD; ++ ++ /* The last padding byte is zero */ ++ block[sizeof(block) - 1] = 0; ++ padding = wrap_pkcs7_unpad(block, sizeof(block)); ++ if (padding != 0) ++ fail("padding should be 0\n"); ++ block[sizeof(block) - 1] = PAD; ++ ++ /* The first padding byte is invalid */ ++ block[sizeof(block) - PAD] = PAD + 1; ++ padding = wrap_pkcs7_unpad(block, sizeof(block)); ++ if (padding != 0) ++ fail("padding should be 0\n"); ++ block[sizeof(block) - PAD] = PAD; ++ ++ /* The byte before the first padding equals to PAD */ ++ block[sizeof(block) - PAD - 1] = PAD; ++ padding = wrap_pkcs7_unpad(block, sizeof(block)); ++ if (padding != PAD) ++ fail("padding should be %d\n", PAD); ++ block[sizeof(block) - PAD - 1] = 0xFF; ++} +-- +2.43.0 + diff --git a/meta/recipes-support/gnutls/gnutls_3.8.12.bb b/meta/recipes-support/gnutls/gnutls_3.8.12.bb index 3ad011742e..daabe22de3 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.12.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.12.bb @@ -37,6 +37,7 @@ 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-5419.patch \ " SRC_URI[sha256sum] = "a7b341421bfd459acf7a374ca4af3b9e06608dcd7bd792b2bf470bea012b8e51"