From patchwork Wed Sep 9 07:37:18 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: 97703 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 6173FC79FAA for ; Wed, 9 Sep 2026 07:37:25 +0000 (UTC) Received: from AM0PR83CU005.outbound.protection.outlook.com (AM0PR83CU005.outbound.protection.outlook.com [52.101.69.23]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.6555.1788939443046327527 for ; Wed, 09 Sep 2026 00:37:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=Z9wPnRsl; 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.23, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DDCDRbb+coWDHjA9Y6G+xU1AfyiT16BmzjYIxCw81mguEg/Wd2nnP3lMOy9lzcdJaDT3cVbAw/9S9Cbj8xR/UXJLSM6R9CD/2abXy7dQUH2f3CHHwp6SWe7B6BvnZ6D0EENyqSl+/CzkqKpYFOm0JLPgGYWx75fyFKIgkKPLC3R+cwe5TxI9vlLOMxDFhR+I7DnGLS8R0mbGpRO04HFOlHcvMcs8k06T7mlrGGel3l6X3wsPwbtr96DCIbMWer+9/n3K8on4JgwdMBnPO2X1SkkphXI3lgDXMkvlGKoHLwZJE2d/ngAARd7DFXfRf1YIVquQuYZ2TlpFrombF7GYhA== 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=faWsmshuBUKbRPzwoKWiamIQ9FQSyFmGsDQUHaIlaaE=; b=fyAmfKCdJ6FjqWiFiSApsq5nPYMelAOiCwsO0rIcs1duszfOZ4KBBqyUkfckFV8p0uL5nPdQbCvfIkuATPQJ6vxNH1qI+cQQd5yuJ3A0BaJQfxZbe05d3Ev8bFdoWturBvjTnao+yWMMEBz/N1oJIRDrWJEGjl+0gN1JorvtYjLxI3DddQPJJDhjb45BeXpsIzs8iYKx5KrgSFJtfLC/xiTlSqtjztylks2bw3KwpMUPVT2VdxCDuQSRy0HRfeMGgrnMR4AADex+h1UHluqen38Ev4akRuPuxGBZvd2Pw7a3f7ihME/mVL5KxmLp7Cp/DsQnYr6hvEyukUrAniEsCQ== 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=faWsmshuBUKbRPzwoKWiamIQ9FQSyFmGsDQUHaIlaaE=; b=Z9wPnRslozVYjpBbxBtwiVY9UujXKhPXNgRpXbomkBGU4yAcHvnvK3Jq0CHMZQe92kgRAABSM4mL7XUz1q8JOYc7XuXLUBbt7DPLQTf+Mf9AqsOZVmBazJkDOXT9Y5kMlgoT+AGBpu57ET5A2kGAtmvbvOlnt5ihe6tsXunS6UMj2tPgU6N5SU31BscdLpGzhjNEMRYomIedPHGH8Ghv3rN5ACoeQMfFpxOc4vjrjBOYZd/OBox978pTQBdY1Z/lHhUcFqVQA1ryAqdLjsMtPhSuBGR60qnwDr5RG5fHEMhE8/krlbn2uc3z2AY55n0nJzfH0fPfx3CE6QvjHEPlDA== 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:18 +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:18 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH v2] gnutls: fix CVE-2026-5419 Thread-Topic: [scarthgap][PATCH v2] gnutls: fix CVE-2026-5419 Thread-Index: AQHdQC4K8brBsWaKrkqG6h8Cf2z3Ng== Date: Wed, 9 Sep 2026 07:37:18 +0000 Message-ID: <20260909073715.15668-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: d4e83b2d-558b-4dc9-19bc-08df0e452d60 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: J3Ef2xco5P4Ycq9dBNrsRNtLOnxmamlgW3hQeQki5I0ZHqLc4Qwx4pUXSQ7jjl0T3Axb6CRQkEzoUfS2qXRpIwUAJlMRFK61eiig8sIXKNkkYt3IGsAg75ov0Gw3XVO6FtTXg7z16YumIHgn6mM6+fCGFUeCq7dF3LPQivumCg2y7+Oz3TSDNXgbkFUUGZt31UifZYmmtjkbCp4X55FpzptpYsPNbFAKZdvT/DjFOv27ZCJCgVs+UJVqatSsGwZP1RcPvcDRPIG3dRc4fZpzt4sH85/LnhXT1JcaHN6G3tQQGyeOm43eJQgoH2DRe9xa4FhlxclXFTXnIX3X2vJBDtaSwq+Zu5+tCnkVgpEEX3iIgaCPEWaR8QbIhkj+FTYLer2WjRwZ0+PWuKaar3HdNBDapXJ9U6h4pQaVhYMh+sQ6mB0sZw1FdhYE+KJQIN9ieCnAxdRxRi2VycMa2zKbra38xUfRRnj1+12QIfE8bLx/qoMAl/qsgOuDYOS6mk3r1SshLLzEShZ7CIZEYp317X0kBV8wUt8EnsBPz93Q0MhlkBDjcbfv62MmxffiTvZNfKt3bm7wkHbuyjMfO6p3YCk8HRpj5y6VFFExbE3Ia6vc9gtCdckIFF7GoOK5qp2bgWb9Clx05IuQBGUsf5fQYz278mBBTH3erSFemfs/AeHcX9Z/JuSc7cBTk/WVlchqdDPQ5Qocc5d1kVd9FqZpwJfFzj8n76UkwyHW8Flh+js= 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?GhYkKJfAxsp2NOV1QFQ/geA?= =?iso-8859-1?q?KPcfMB7XJJRLjSYZq9TC1OohpNlV0nL/wY92P5mNh4IASouduzVY8RhKEs79?= =?iso-8859-1?q?tS/DdAkBVOTOfOgj5LGA2qbT4vr+KiSoLaKpENqHrW0E4kPEijGx1UIwLmPA?= =?iso-8859-1?q?C2SN3OIKWbNwLZebTz+dP7CnC5baE2gp5XGck/VJIhIZPTKhxMaX3CM0F3IW?= =?iso-8859-1?q?QbHmNqmJN2uvwsl7mjXvR2YG9adun9vZlTQXwovDWkZSl4Krc1A5XsXFhhuO?= =?iso-8859-1?q?uYc8qbTnrZErn6DZlpqpgApmsWEYNsXP7HJZRGgN9bijl/vCco9aCvFCf5bU?= =?iso-8859-1?q?gPmKUNtQ6/H3sNN9wZPVtxbj+5pg0ozCykGKb3E6yRDfdSnajfkpiGukyx03?= =?iso-8859-1?q?Whc1Ag5guwHIB1AazwuvSInWBUnXmIMaeH/NYkf8Ooj1HtJHU4zRSbmU5ONc?= =?iso-8859-1?q?lIiZd29pbLPqZNpkoFuod9f0ejc/x+en0s9xE8gJF0ObCYhOqI0wJ9Ecbyuk?= =?iso-8859-1?q?9sqvO7sQ38KD4ITpdc4F3Fr/Hi//EdlBS7LwjT+QGWnrj0TIdjLqbJ8QQHwU?= =?iso-8859-1?q?Hy1L3k2Hh0ggkL/4qo/5rfRMqe6atYrpykOdqa8sPQGZq1V5IosKVgSG4bsF?= =?iso-8859-1?q?akp/cIHQ2rOf+xwNGd9LAyKJg+UkX1/HEIUPvOfLzNZ2P+0p1dOfS+UB0Xyi?= =?iso-8859-1?q?sQ6s4xlTLmUzKhDzuCcepRU7vrVzXUFO1fzYDs3r4TyM4glgLgnFpugn19o7?= =?iso-8859-1?q?5A/StZAttie1JKZPYGEPlKLqY5gteSvm30QoNYdh8AlUHK2agTAzEq8WmHMN?= =?iso-8859-1?q?u0fDH9ZMA6L5R5TVmKtmN4vqs8A+OfwRUwr/YIUdGGuPucTDLZ+84rOfSQuh?= =?iso-8859-1?q?TMdWLsN9ESBKnyaUNHTlvIhL2p5rQTtwAwwlyCx3iDN9hqriBMdIfyY0gayF?= =?iso-8859-1?q?ySsmHIhuWNDmB2N5m8bQcS+ZZjDhxCsJSY6fhMfvrZ+R8zuiIJOewuNJA1Q2?= =?iso-8859-1?q?y4dfl+rP4XXdlj4tnoqtzdu7Ox56hM1hLNLGVBABuaLtuHcFGkz1OctGN/2F?= =?iso-8859-1?q?7DrA6kMiGJ2x4DBePD2nVjlgmNtBPqKaVbbsufe+ls4coxO76D5HHgKwZ6f4?= =?iso-8859-1?q?BYyiZdZRrG50VuRrkzcnMN9paxOKu14Wj4ro69LA5THFJgB9+LfSMKYMshWN?= =?iso-8859-1?q?NHV/0ikTuT2FwFTUbbU1gn0TzVr4mI6aqxYSbGOamr81xEhz24CBo8DtyBEm?= =?iso-8859-1?q?7okkEGCd8vlNxo3DuEBefA6bs9eL6kH+ZH2TO/ipVKs4x5b0MYSpuTx0YJUw?= =?iso-8859-1?q?zZxmC1D4cNSNpZRkRMaHh0oKN6v1yAUWLqSq879zey22wXW4Oblnk6qkE1vY?= =?iso-8859-1?q?Ecy1s06no9gZByxdBFZMX6vNcwJc+0tNnKwxk+00tDwyDYnnyZsFzF6dDJfC?= =?iso-8859-1?q?XKVDJAm/x2/WR829MZ4Q1EoGRBnJ4o7dR86RIlTG6BlK7Q2Q5/tQWc4/PyIH?= =?iso-8859-1?q?bhpUvix0Q/rJEfAJtkwSqCREKiZFEUlMi8yNtkyv+POu26cPi7rHv2tzW+d/?= =?iso-8859-1?q?N638Yk4hBlBIVeTTzSTZEkv7SXYn0Dppr5wJL7wL3Jllxk7GFUS0qh0NkcD+?= =?iso-8859-1?q?9hSfX4ENGf00TWfwkQ4Gjp8CHw2R9AZWyyIlgL6zbXiZY1T3BteU25w9c1y5?= =?iso-8859-1?q?j/poOIiI+N4BdDM12ihdgjQYdbLMgPiMkVt5hyob/Z0MSmplAo0CnbufRjUJ?= =?iso-8859-1?q?4suyYxGTphtoFDafVAHLBMe4v8AUg6dk2JvmvWSBUB0f9qA=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: d4e83b2d-558b-4dc9-19bc-08df0e452d60 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Sep 2026 07:37:18.5578 (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: suAkiylHTQ/wA4siyeRO4xoHeuf7b8A/WW2fz72gYdxjNaO98vaf4v9J1Q9HKxAVdnJcy3mGlguljAL5w7xuM9uowxu59w5qCnjcNVsi5JM= 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:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245449 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 ptest 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.4.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..79c3030773 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2026-5419.patch @@ -0,0 +1,247 @@ +From 0ff1cf201404afc6b227f9ddfea376866770a9d3 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 4 Sep 2026 09:16:30 +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.4 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 bb5c3ec..7ae0ef2 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 b02babf..f269ff2 100644 +--- a/lib/libgnutls.map ++++ b/lib/libgnutls.map +@@ -1551,4 +1551,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 f227e92..32c5335 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -238,7 +238,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 + + 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.4.bb b/meta/recipes-support/gnutls/gnutls_3.8.4.bb index 0eabc517ce..b4be891d23 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.4.bb @@ -46,6 +46,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] = "2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b"