From patchwork Fri Sep 4 13:37:07 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: 97313 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 F0A02C61DD6 for ; Fri, 4 Sep 2026 13:37:17 +0000 (UTC) Received: from OSPPR02CU001.outbound.protection.outlook.com (OSPPR02CU001.outbound.protection.outlook.com [40.107.159.20]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.13866.1788529034387961701 for ; Fri, 04 Sep 2026 06:37:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nokia.com header.s=selector1 header.b=GJvHiPql; 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.20, mailfrom: jakub.szczudlo@nokia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wRvzxB2fbZ/eGoxLOqYpMiRIx/ebs06fCHIryvZFDR5xSFL21Gia3mdQXNo+bKGTYgMWgAJgbXc+RlYKKE2IHQxfGSBsS/++8/vUrJgl6Hv4/gAsE+w4R0lfpAFpohvBcCinj3o8AZG78xmjIgttb8uI6g49QjRapnRDz18nGeNPJZLiQTl2Q6qRTQPJibwLT5LjYk/T9pgw6Owzmed3nIZHyjKhkoB7DGa81FUqQuXyVdCH9NG+AbYqrNRuLo1BkuhvMDVQ1qoO0CEydtZNRys6rcZnvy39SEKu+gM2vsTkEGMTBFDZDav8pR/3x1ClYNiX2ZyEES0PmN8YsggHug== 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=rclo7pEna3ldC9QwLFxuvqyQGuKZ4fAgQkWlgtHexag=; b=OGmAxwb9q7nCgnvFxjBSBxiWOwzJ9aEHTl3hwlaUYBrnsuXmHn1CAP87mLlIGhYHPDF9X9fQIslmGSmeLDj6uSKUECdjiuT1TnmL7wExNZD42NM8ysf1x2gC6bpx8Tp/DBKtMozj1qZ1e+XqSti0QNQxs/98orbcMTgJo2pz19EsoWQqrBXVN9j+E3eKcAEiPc1pp/es5NiPzEeO65gOdz9QfyZy4Jb4/ZyascX3aaS2BxJaqFCvpNvwR5qSU8Kkdas8Tm91tRks1VRx/BMX92IIBJVVZds5au4BveNg4vWN8lkCdmEka4zb/vvULZSQruw3uAYPl2GxywSxXHhHVA== 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=rclo7pEna3ldC9QwLFxuvqyQGuKZ4fAgQkWlgtHexag=; b=GJvHiPqlvgeFn5tfg64S3dSuDWk2P+E36zq/4t6+ANxOQXHyYDcvsV931mYY9qqsXt++0ymRqNT/hNpgeowylSvFwhMz5pEO5/+DGznRff7DzPC51tRM2ycQy7Nkk0cdu7BhtLbvsPWpqlZmkVQVTSS12GhumRC12ZCFJi8KuX82hp7cNj5n9ZMROhmn7bdHbBWkQu7QAbi1dFa2bVPcg+9bz5w7/QoCU8zO4RIEmK+HkvYp/KMhPuiCD8PV9IsCpQ/wuwwz/FvzaCWz7Tdnx7ylD2eb93QGoLs1Wj0PvlBlLoX1pQ07eTjs9BFUBYXnI16STmk9sQ0G/0ldF93kiQ== Received: from GV2PR07MB11919.eurprd07.prod.outlook.com (2603:10a6:150:357::20) by GV1PR07MB10192.eurprd07.prod.outlook.com (2603:10a6:150:203::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Fri, 4 Sep 2026 13:37:07 +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; Fri, 4 Sep 2026 13:37:07 +0000 From: "Jakub Szczudlo (Nokia)" To: "openembedded-core@lists.openembedded.org" CC: "yoann.congal@smile.fr" , "Jakub Szczudlo (Nokia)" Subject: [scarthgap][PATCH] gnutls: fix CVE-2026-5419 Thread-Topic: [scarthgap][PATCH] gnutls: fix CVE-2026-5419 Thread-Index: AQHdPHJ6OPqfkeeV70e/0/PsJvmROA== Date: Fri, 4 Sep 2026 13:37:07 +0000 Message-ID: <20260904133659.46539-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_|GV1PR07MB10192:EE_ x-ms-office365-filtering-correlation-id: 60f45231-1b32-4d13-bff6-08df0a899d19 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|23010399003|376014|366016|13003099007|38070700021|10067099003|56012099006|5023799004|11063799006|18002099003|12006099003; x-microsoft-antispam-message-info: 7Z6ZIzLOftG2alsCOk+KyzO7qBKqN1/jUOGOPwnm9nBwu+VM34yTfHgw41OF4yd/BMstm4CyTScD0fZsXOzuIE3ooCAC3sXr3IYy1kx81a3Rz8r5FnzcCrZWrOtJdmiPn7OpQX1xPuayk0yNJzCkvQPJKcNZYR3hTOZ73DGV4SCW70l3fFMuViChRhTnfZOEm6RmYxvR7MzKaCnqwB1i3NxizLPNY4F1H7EiXqkWLtdmell8FzxwdVKlNLorKg08pLgYXLz5x8HOr8mURP6TOiPDCYKSsgj6Inp2O0V19EuIme8qWkg7PQ6ZDiP0gdLIrT56ntVwVR2zl6/zviUiC02UVkiKIb9crFdnLX7FOky1Oi9spE5wml3Ow0RNsA2LItUGzHx1rWuLwOjYdmyH9XoWUqS3pfqs5X/jHfWEHQ9PlTwWU6cFBUveGhuKLd7tujAraM8blWbs5T13CC1kLe8F9XZhHSsZlhsZ2b+j1k9XWNb+rnFu+r+Yj++IuS/JUPxZgL2WmepT6qVKrGmAEq/vLOMkbNMiuTIJk9ttmNRwJhyrL+dfkFjmveEPRsxu1798epNiRs5No3zvsxHFD45n/cOhYztBnZGCX+D1TxhH25hfPk1StURGD6pmbVBsRkjzBzg+AhyQj8K28UvuYKcaasJZhCLEQ42/ccca70OtSGKEfOOp0tGAEbBNn36A+sD7j4JFAUEqQQH95PIqGecn04CC/1zh3zwmFjmZGls= 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)(1800799024)(23010399003)(376014)(366016)(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?rxBX15UnGhdDGHbIHZAg+5p?= =?iso-8859-1?q?mcgNYMHjla6L9WtExDMp8NXJhuoLoeOFUe8MEQ4pZEyj97pysMG8XwiTVIhf?= =?iso-8859-1?q?oA+c95om4/rimANt2XM9eOvqs+7lkVgNBCngBDxLtfq11A2VJ/TUe6++TtXI?= =?iso-8859-1?q?mVEs4ZoQoeNHawjTXaak2AvdU7/Vq4dDnnHDa1lYN0eqBxS/TTziWVlwA2AQ?= =?iso-8859-1?q?aNu3v0kl4vYD2oSJZFYvdI1pWL8BD+Yv8F//InO6yxtGPv+mrdh5bQ1ayron?= =?iso-8859-1?q?P05Rb16QEFiMJhZGjtyemNA4q3G7pER0a2qYikO3dp0/cpNR8jxEXrr28bv0?= =?iso-8859-1?q?j5NeAdbXRglH6Qshc3E85CMhweHlpvNiPq2uoE0AjcAdGn7a0ZQcboysF+o8?= =?iso-8859-1?q?ZxzR8gTxn1Nt0WzQOMCUdGdpSt5YMtC+g9ZoBCjymCAoOio/4lwKjWhaDi39?= =?iso-8859-1?q?cesF2gkBF65CdNFzg7nhOjtfzDs93iyFbm42JE+xeDXivuE5kDoFGa8U4KAC?= =?iso-8859-1?q?Ux9HFEjG+BIikBmPOSnm3wmrM09wv2KDrz/LRAwSZRQfDylhLRL8LOyRSzUq?= =?iso-8859-1?q?l8Kin1NoH6mGFWWC5KQbAO5mabSvFuqJnhJ563gdxoBc1+aCcKxkZQ9JfHZ/?= =?iso-8859-1?q?34PgzIlQhp69odTAGLfrqRYmvSRDfm/r6r8lS4HTxJTCJ0wRzSxC6wzNkmCY?= =?iso-8859-1?q?P2hKO5NS4e8r+/zoNtzCpp2WoASnqokkZjtKZUSOipnXA17s1IytxS51VDA6?= =?iso-8859-1?q?fun42MyYXfc5s5gYIq/qY9ViwEEq/1vDmBzfbpQPK+vZzvXAcMuSocyxIcWH?= =?iso-8859-1?q?Iyz3YpyJ//13qTKg0PCNjWxW98IoSCNsx9NPBm9Sguu1QBWUyVZ4mtxVE8rh?= =?iso-8859-1?q?NpkkvJ5fWNzJeg1p2Dn1U+gjWqeZzB/8BcYSVzdkUWWKMyQihZ/R9r3RKmT5?= =?iso-8859-1?q?6LmBHdHGCMZVp+Xa2R10lsHnkVauSCC/TcbdtXovQoT/C6ix66ZrzuW9sHO0?= =?iso-8859-1?q?YuVWMiaVNCD6PpkdbEpzAzs2cKO0FX+25FFr4uJP0833EhzrHV1DEk5AgSmD?= =?iso-8859-1?q?iR7Ot/fVHdEi5utkQTWMnH+J33HLoU2lsttwFdy+VL0dcdFOL3qPWDT67426?= =?iso-8859-1?q?pMmIyBL1qI20RZVpoPRW/Tkukyyq+UhTJkGf0lB9iJrXPnkcRCtix3g7kJnb?= =?iso-8859-1?q?6rn/k1PZbJum4W0nbBM7fvHZJGLFRDSZtvXzvYyMyzutA5klJy6rCXKz99fr?= =?iso-8859-1?q?bUnv+dWy1ylDJM+zUhBlN7B6w5MQzBaet6QOcAsDDFOHVwLBgRJ+RROwbEyj?= =?iso-8859-1?q?hCGLS+0GWyWd6lAm0zge8CGW+rbWXuvoBSoCqTe7YKmng9NUwgK8HtiKo2UQ?= =?iso-8859-1?q?YlbkE0WhW3o7cRATZsVlqx57alAriKzsJuqdY/pQiNegh+nVDpfUXACOT/K1?= =?iso-8859-1?q?2/2KnDy71n91JsdKet5YyFElXHCOunGikNoSmiNN30GPA46QxszYzBYuhdE9?= =?iso-8859-1?q?l8mnkIV1/atdMn54Cbv+vuP+fRbMxhUGMQFeq8vzyL3uN7sd3I0bfEs58R3B?= =?iso-8859-1?q?984Rg7J6RTzt1osX1+nHFwq5/Y/wkuzxeFCPy20UUz7HMOxTCXaAxFDEQeIG?= =?iso-8859-1?q?PRCmvi39B0MYtQiXZDwBtnmrBuuIAWZD59j+MHn76Lrpjkli2RS+U4qk7Qs5?= =?iso-8859-1?q?+SHsF0QLTacaDpQzUSVWLEQtkcNB+q/NL3j28gWzEr2nMbmqoiPzRzp3f8P1?= =?iso-8859-1?q?Prum46thJBzj/z3pEFnh3uVm6/DM5bSJrXIKRdf0odElXyw=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: 60f45231-1b32-4d13-bff6-08df0a899d19 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Sep 2026 13:37:07.2200 (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: nU9+LhIDvq4u3eBE8ltWexBNFxq6M5fXIurs3MQyAY9jV1O7TwDL2Fm1b2WRTNFh6PR/+aKlnfaUCJM3DYy4gcuNH19Dsn1hwiPOJxG1+TM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR07MB10192 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 ; Fri, 04 Sep 2026 13:37:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245108 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 --- .../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"