From patchwork Mon Aug 3 14:17:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adarsh Jagadish Kamini X-Patchwork-Id: 94325 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 C9928C55838 for ; Mon, 3 Aug 2026 14:19:08 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.44172.1785766647382335015 for ; Mon, 03 Aug 2026 07:17:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=WTgCHLUR; spf=pass (domain: est.tech, ip: 52.101.66.1, mailfrom: adarsh.jagadish.kamini@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mq7pQ6fzS9RcjYFruXFCystAHTo+hpi7D34K3GmYBDCU0Vi3nsND3s57c3j8A9CuvL0BUXgBozxp3QHp0uDYdhyD7xMNGfO3dKpy2ak1x2MEoA/nJtN2THuRkxPkyWNZQAL7Mf+C8Cq1yFAGKzt6XCpVFhA5WqZraVvDRzT+oB1vDDoYRzRInJvXb89oywgq8Ljjy4YSebSwJ4EvArRStoaqOBR3yrihfDbf+N3fWVtYIAffHmEzoLKeMzKOp4zIsP9ZaJ+OG8KJYEv/srlJC5wT1j6+2+A/vntVHA3EgDYXpo9DWAVSU3hxn/arUV3n5+5f35JruFNnyxzJZZzD0g== 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=M58YcnXt0m2hPZBJZZddtpjK/XxZukls1yhSmpGrv9s=; b=DaJLK0aoFWnszOWCSUbaeT22sC4IwUZqpKX9VLpiWiiakm5TJhjHtfeTal8eN2m5k6GhCHMFl6axAQ6W0TCW/jZnqwCr/gKQQ42PoQUWm9nOnml8n1P45ppeTjTpKzXpcSNKDrLaqMY6FvwoE7Mz3Tlx98RUOTfabOQCVAKNKcSnFisR5gb9+nw0N/88Lca9C2dp5NZVJEvGb31wOA6ijT6MijqHHs9BqmTZBzvHDWtf35nqdIbGo70ze64PzEwYr7tdyA8jwMi8MtjSL4piX8aweaZ7LCCE3oS8A8AlE9kmOTPgRjXTF5baqZzejCAr1t1hal0onzi3vHhJt/gklA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M58YcnXt0m2hPZBJZZddtpjK/XxZukls1yhSmpGrv9s=; b=WTgCHLURRI+38BYiaKIVV9/Gjavpd9NSCtnOmTsAfhqZpaNE270c95i9W8+kJXNU3k/9yOkCmr4EVoSUV5xf5ledL9AatNqLsWwWdPUZ8eg4tjz/zLyI1NwdTDvK5rwb6QtJ6nSOwZtfLKxyofDNrJ+FPNQ++sGQ2jW0ZNw17V4MACN6/sP1Vr6cHnNEbedWEOuTkKodijGefb4L+U2pJnuXlLxTVV01yvxH6F6ldqJuNdWOMRwWTUuBS9hPEYlWeYmVGumWh+Fxkn53UBEbN5e4MitoCEBTLvnVQePAHXJ0fV0W4/WEUsx7YT9AodTg+JidC4TOT9XK5iZcLvNSjQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) by DU0P189MB1820.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:344::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.13; Mon, 3 Aug 2026 14:17:22 +0000 Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff]) by AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff%4]) with mapi id 15.21.0292.012; Mon, 3 Aug 2026 14:17:22 +0000 From: "Adarsh Jagadish Kamini" To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][scarthgap][PATCH 1/3] thrift: fix CVE-2026-55971 Date: Mon, 3 Aug 2026 16:17:10 +0200 Message-ID: <20260803141716.853285-2-adarsh.jagadish.kamini@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> References: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> X-ClientProxiedBy: DUZPR01CA0189.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b6::7) To AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P189MB1672:EE_|DU0P189MB1820:EE_ X-MS-Office365-Filtering-Correlation-Id: 00ce15f5-9077-4bde-9efe-08def169efa5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|13003099007|56012099006|10067099003|11063799006|12006099003|18002099003|22082099003|3023799007; X-Microsoft-Antispam-Message-Info: /f4A9Sm95PA7+VhcsqcLDei/XOuxy288tbkEgpSM+3b+/w0iFlKpKqhcW88Ld/fs/kG1JQLk5JJqfQ1M+l8Xh+dSsxtYZZcSidbXrb28/b8NO43j1vSYJH0jX6UaDR9grbPHNZUPrczFHDemqg+rwf7fumRnpQJQ71oFX+xgpL0MMpVg39ddOz/7/yk8T8dDVH4FhpbvwHZYpCk0ArLATgfPe1glSgCMGaEKXOmDANG4DHB1cYC5MMPnPuu4T4UqtVAHIxZO5vqcLUBBPk3ZUkOcnLTGBZywgFt59CclFOFTwdjHdVKCdpZKCV/wms0tDNkMcYHLW6QwEp7Af9gvv+5mB9HR93cAF8qfiP17TfFh7F7aeX2VfjNJcIkJWwEhPN/JXsLGZCFVwkX1dt26ZWV6qrG2rkEOrZeU8HVmVPhcNSV++RlZcb4l5RmNmCEukzoIcN4o3+4W0sIgyfsateANPIe/zSYApqgv4l06K3JRdW9ab4IL38vN1r/Hm0MWBy7wMcKZhbIxcqhHj1Sn7iUBlx+2MzDToaWfhg+2Cf1aQmaE2bcaahpO5q+tukLnNnP9AEByX57j3WPza9s90+esTdRlT8cDpBv60TV6v97e1K1HUW0Fk1oKJbRgx+MKpcvmZ2o3p1Pq2ggvi/pFKnDoc+9UpZGTWBQob7Wc9xE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8P189MB1672.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(13003099007)(56012099006)(10067099003)(11063799006)(12006099003)(18002099003)(22082099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OA9sBp7mN10xpJo6RGQ8NylCmZtIXroS8WYIw86W9mwno2ug4yN37TL7ssxinn9xj4wz0aPggOfgI69ycIVaSMvaEW/pXkO7Hdrv0KfAQHqjQcSc+n/xmg4ssrKD16SBWucCeQKphufJ6d29Og3mFytPgpIlAYHUKpjcyEEd4s2zu25DjDXaESfigFNnnAl3D7rMAUgypr/lQPGP2FwLQCNeKFVUF2WK/B0alebXnxeYX9QxOxGiGXZofcJaKoSZB/AwmLRMusYQ+QcGAoOECt/q6KJLwt8y6a1NQNXL1ykM5FatCIHhNPO0VSaMoep9u3gbUz7CzfWtKgzgpY76lm+9BQtGpA82w94RsFlm7RwYEe44FHIgWSCgorozA5LdL1xiWGL0ZLq+G1BoNCJXwKtGTJpvXJJ5NHNRSOpA7h22JPkOlSbj/X3IONWjLnCc92edTB4/jmaNLPmBax2JCma3TRf3xfnzDB4bswMrjcLvn8wq/tEcAmIXvcyfNUMbxy4kcaSFXUnqtQDu0VT5KLMolI5RL3VLnSuhqV4UmLlwSIekDqOvLnrnx0YH0Sr62NhwK0tyMNbTc+mLK0a2bt0FcfT5MBftx058j7uIlA+nGXrm2xv9tVRldzQGmNM4JhtO3Et/ZpK/tzfskO9FytFdCtZpInllGz98y2p2GSw9s9Y7LHi7SAxjV0QCC0Jh6iTqb1Fo8rVkq8PqbU4DTeGeWAIO6l9QQU/8/Bug81/7P8uDQfO5Amqo6FL+5IlvgayG66qoJ6r9GHttLKz/+DmXyayh6O7jXT3PInpxRIsPxdEVsnScsV5CCY89L9EcmL2LH4w08IzZLZLDmWwroXBLd8kx3VpLeRQhr9JZhDzeLFOjCWMIvMzYyfiArWrBhLlBu5joZGJ3RFwHext6ksDOy+6UizPe/Z9Hc7zlHoROhQRh78rfEbI4jSkxx9Cd3fjfqurw8AS3c10immc5O/8avV/RysUa6d9TBBZgN2/NC7d60luH/ps7FAzb6kI0eUOI9/n7SZhLTVZ+0bXjHNGS8d1SBeEmrwcVzUX52bVJvReqvEoEUyZgGZV+mTJt2ag0ffBrE+bKLo4x3GtS/qp4CSDfGX4chEpq2qi0THPax8vHDa4k6uYtH18ahuJig71yetaMNs5rkQ+g13Xs0JjwTNhfwQ3ME5E6gVxK29G8+9PkSbCATBRKXXx3oQna0kNOjVzWi100Hu7pjjw09PmotOgylecaQDogdjFHePK0CPuhGAF8XNs0hMTz7ECEg/uIo2JmhEZKzVCGxu9Es8r3bgtmV9pmbZOvllxp487Pzvne46dkU7CDuQTUfvmHdF2NAsWYYYeomvDK6PDdvwOFG43GivMph8yDMs663hXvzdgRIrX416cdP95zGOKY0C3/Ra7/yxz8RYgDFyuCAKodQRTCLHPVWeD3DZhkLAj6C7lLLVCwZM4RY55KZuereQGFWTMXL9qfWvCVwYIm42KE52vz3PclUcZXLMVBijlMVrk7V7O1TvQdzDrakg4VbcUGmUflOwLFlqQDBF/Zy1n2gfvTgoG6Ts4GXWcxFjANaWh1oMxcJXooWer1gPUMCInks5r5PR/mxH5esh4sjJY38b/1GI6EeOwJb80X8MImO7vi7f/K61bUAd4KMqkE/84kOVbgocuHYmYQb7H8S+86s6FJ6p250Wsekn+WsHwhJSUFocLopQQRVA17/Rqrcgj0hW9U4Du0I2du5mDv6Gsg3p2OFx/1EiYAz7XZqAmx/TobYw42BTveL8eoHUGJ X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 00ce15f5-9077-4bde-9efe-08def169efa5 X-MS-Exchange-CrossTenant-AuthSource: AS8P189MB1672.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 14:17:22.8477 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dop2nRAXdCPnyDnoVryIIDKS3gG4/n7tCXmMz+xieA6gYDOXnMN3Ns5AW5LAI/09lS+cxX6TD+ICyU2UTx1/XPCshujcbMvOFtAf2NnJedI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P189MB1820 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 ; Mon, 03 Aug 2026 14:19:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128690 From: Adarsh Jagadish Kamini Backport patch to fix CVE-2026-55971. References: https://nvd.nist.gov/vuln/detail/CVE-2026-55971 Upstream fix: https://github.com/apache/thrift/commit/db4a473f3a984eee27273256fe737be5dd175595 Signed-off-by: Adarsh Jagadish Kamini --- .../thrift/thrift/CVE-2026-55971.patch | 98 +++++++++++++++++++ .../thrift/thrift_0.20.0.bb | 1 + 2 files changed, 99 insertions(+) create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-55971.patch diff --git a/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-55971.patch b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-55971.patch new file mode 100644 index 0000000000..584352a027 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-55971.patch @@ -0,0 +1,98 @@ +From 46533058efd34461065e029d9f180a349647db5e Mon Sep 17 00:00:00 2001 +From: Jens Geyer +Date: Wed, 17 Jun 2026 23:27:46 +0200 +Subject: [PATCH] Read the zlib transform result directly in THeaderTransport + untransform Client: cpp + +The zlib read path decompressed the frame into the transform buffer and then copied the result back into the receive buffer. Swap the transform buffer in as the receive buffer and read the result directly instead of copying it. + +Adds a write/read round-trip test through the zlib transform. + +Co-Authored-By: Claude Opus 4.8 + +Conflicts Resolved: + +lib/cpp/test/ThrifttReadCheckTests.cpp (1 conflict): +- The stable branch lacks the prerequisite THRIFT-5854 commit, so the + test_theadertransport_header_size_exceeds_frame test and the + THeaderTransport.h include it depends on are not present here. Kept only + the new test_theadertransport_zlib_roundtrip test from this fix and added + the missing #include (present in + upstream's tree via the THRIFT-5854 prerequisite) since it is required by + the new test and is a trivial, self-contained include with no functional + code dependency. + +Assisted-by: kiro:claude-sonnet-5 + +Changes from upstream commit db4a473f3a98: + - lib/cpp/src/thrift/transport/THeaderTransport.cpp: adapted from upstream + - lib/cpp/test/ThrifttReadCheckTests.cpp: adapted from upstream + +CVE: CVE-2026-55971 +Upstream-Status: Backport [https://github.com/apache/thrift/commit/db4a473f3a984eee27273256fe737be5dd175595] + +Signed-off-by: Adarsh Jagadish Kamini +--- + .../src/thrift/transport/THeaderTransport.cpp | 8 ++++++- + lib/cpp/test/ThrifttReadCheckTests.cpp | 24 +++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +diff --git a/lib/cpp/src/thrift/transport/THeaderTransport.cpp b/lib/cpp/src/thrift/transport/THeaderTransport.cpp +index b3b833389..117c8edd5 100644 +--- a/lib/cpp/src/thrift/transport/THeaderTransport.cpp ++++ b/lib/cpp/src/thrift/transport/THeaderTransport.cpp +@@ -298,7 +298,13 @@ void THeaderTransport::untransform(uint8_t* ptr, uint32_t sz) { + "Error while zlib deflateEnd"); + } + +- memcpy(ptr, tBuf_.get(), sz); ++ // The result now lives in tBuf_ and is typically larger than the source ++ // section it was read from, so it does not fit back into the receive ++ // buffer at ptr. Swap the transform buffer in as the receive buffer and ++ // continue from its start instead of copying the result back in place. ++ rBuf_.swap(tBuf_); ++ std::swap(rBufSize_, tBufSize_); ++ ptr = rBuf_.get(); + } else { + throw TApplicationException(TApplicationException::MISSING_RESULT, "Unknown transform"); + } +diff --git a/lib/cpp/test/ThrifttReadCheckTests.cpp b/lib/cpp/test/ThrifttReadCheckTests.cpp +index eb4ca01b2..2ef6ae0c6 100644 +--- a/lib/cpp/test/ThrifttReadCheckTests.cpp ++++ b/lib/cpp/test/ThrifttReadCheckTests.cpp +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + BOOST_AUTO_TEST_SUITE(ThriftReadCheckExceptionTest) + +@@ -224,4 +225,27 @@ BOOST_AUTO_TEST_CASE(test_tthriftjsonprotocol_read_check_exception) { + protocol->readMapEnd(); + } + ++BOOST_AUTO_TEST_CASE(test_theadertransport_zlib_roundtrip) { ++ using apache::thrift::transport::THeaderTransport; ++ // A run of identical bytes compresses to far fewer bytes than it occupies ++ // once expanded again, so the result of the zlib transform is much larger ++ // than the frame section it is read from. This drives the full write/read ++ // round trip through the zlib transform path. Keep the payload small enough ++ // to stay within the transform buffer the reader sizes from its write buffer. ++ const std::size_t N = 700; ++ std::vector payload(N, 0x42); ++ ++ std::shared_ptr buffer(new TMemoryBuffer()); ++ std::shared_ptr writer(new THeaderTransport(buffer)); ++ writer->setTransform(THeaderTransport::ZLIB_TRANSFORM); ++ writer->write(payload.data(), static_cast(payload.size())); ++ writer->flush(); ++ ++ std::shared_ptr reader(new THeaderTransport(buffer)); ++ std::vector out(N, 0x00); ++ reader->readAll(out.data(), static_cast(out.size())); ++ ++ BOOST_CHECK(out == payload); ++} ++ + BOOST_AUTO_TEST_SUITE_END() diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb index e4fd07198c..23a6debf9a 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb @@ -12,6 +12,7 @@ SRC_URI = "https://archive.apache.org/dist/${BPN}/${PV}/${BP}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ file://0001-thrift-pr2755.patch \ file://0001-THRIFT-5842-Add-missing-cstdint-include-for-int64_t-.patch \ + file://CVE-2026-55971.patch \ " SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6" From patchwork Mon Aug 3 14:17:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adarsh Jagadish Kamini X-Patchwork-Id: 94326 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 C07DCC55182 for ; Mon, 3 Aug 2026 14:19:08 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.44172.1785766647382335015 for ; Mon, 03 Aug 2026 07:17:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=h+GqNRNJ; spf=pass (domain: est.tech, ip: 52.101.66.1, mailfrom: adarsh.jagadish.kamini@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PPKzNBl84nWayPt+TL9oqeMeSlVBHA5AFCqzrDf2xkKV8UFUVufHGCecS/F5GAq+TvPlI2hKw5Me9/2nEqxSgjRwJ6r8olnuxhWO2TkKlJmhYZP+JXW3xg9os6b+b0m3Ck/HwsoUpGk77gXdvmjOS3GU8/NfdDgc74fijzgmyMldaV1GhhzCFc8JaI5lk7Z98gp9eCR5bDXrHhMxWv5YzZEbua7yifFVsON5C+E6z3LmPUSu8fAVtFiSHioGxyuU2fdEDzwTVwSQ8UIGlkD1Wmr7npC3RS/UjRRuu6MsCq8fiiaMmoARftso6SIXO5fEOls5dYPyiOmnLjsMz0+r0Q== 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=Ec7Pswxo6LZ9OPU2fiAQZKYJoPKNOoJtFvlWGUW80f0=; b=NxX/7WGvYmNe8k0PkFbCPpDC1O0rRqFATDipbfN2FYeFa2cCjItANdkQxhGU8wsGbDPSIFNVdd8DNPa4Dhi89CFKVg2/WcqSDHsfhdr//q2NptbANzrnJI978YaN7j+6XkGsAm9xmPbPBh6Zsg5hpZYkyLfYH+izlX7nr6nAF4grusnvO3+xFyObnztoZmlPM8/6CHW84kra5slCu9bvxZ82apfY2U6OgCr0cGtbxudPMneAlGkhOolYCqB5n/iX3y8c5ogi9ikY8kWhVqGEWggKx6nzQRBwc4LwBtG+KRLJ5qWNgzU17awugYsYbcWFmdDG7sz1VfzphLnX5450ug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ec7Pswxo6LZ9OPU2fiAQZKYJoPKNOoJtFvlWGUW80f0=; b=h+GqNRNJHndUJub083ZaPq5kBR227wLLvC65cxGB3FY9ZgMOz1yykkHo3W16hP/dRyN6QMd6Kyx2rwn9fNY5k7wdRT3G57uu2+EAGIy0dxBWaRBWgJ3oVhnrhRB5FQTbo5O2jae2eGEjq1/3GW3Y6uoY/bwQnT2aI26Vd27vfU4hbW8+ZgxpgE938dD1qxipvtZxHpNdxNYMiaK5mLiSzS788kNgL6heyiLnwupY/rGwVAyOfTkuSKgK0SYXljPlbTaV1g0GHhp4DNbHnCqQ1lpHaBu1PFTC5c3UqJGvlaaHG6WLQXvzALsyq5LIRDQ6xcDF8B7T6jXf+rSFZIxcjw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) by DU0P189MB1820.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:344::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.13; Mon, 3 Aug 2026 14:17:24 +0000 Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff]) by AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff%4]) with mapi id 15.21.0292.012; Mon, 3 Aug 2026 14:17:24 +0000 From: "Adarsh Jagadish Kamini" To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][scarthgap][PATCH 2/3] thrift: fix CVE-2026-58023 Date: Mon, 3 Aug 2026 16:17:11 +0200 Message-ID: <20260803141716.853285-3-adarsh.jagadish.kamini@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> References: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> X-ClientProxiedBy: DUZPR01CA0181.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b3::22) To AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P189MB1672:EE_|DU0P189MB1820:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d77855a-946f-4fea-9a89-08def169f099 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|13003099007|6133799003|56012099006|10067099003|11063799006|12006099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: P9ZHbjNlboh9alAefAducaYf+1eVGA+sU2MRxxIUNJTYxWS1bHiazx5RpqptHvikKaMoT/BHPfUrIrRC0IQGwt4BW8aoYoUtlfVgRO7gO0LPqPc3vpdKjAsyukk7MiATcyMdI2ZXNTpyPhiAabk9CPwWas9NnFjAFdRYdEZHieLFW7US6ASB9eGI2xKlw+MU+PwWyfiIKnfWRIJ9j36Zg8Us54e6bsQyisRbre78WNJzQ8u5vSPJb2Kz3XIi1obqewWB1oOTREEFxy45pV6kgv4oOO39gbKbAFbg4GzsJAY8zvQ0OH7l4O1Cjgrt7EgLT/us+PckDHhwsu8tls4VAykVf5DQetOjk2bdtDvw52xpvqnWrxv1jBaKGWEtccPVjMDEz8NCnTp9/Dk0AfGmeYSHEn0wCuDDl7n9pvCoVNf7mg9NlG8Z3lFdRJ+QvtfspCGq0jbtZ6oLhhFems1WJQ1d58udnTSOZmrwegXCqRBfawFQyBjLWo/iziQVYS4fZF7q/8MczO1fX7BrtYygM0MkKsA/elzVHGQzf5mrwKvQO8Tunq3EYGSMqiqHy6vWiFBofKY4NAIoNVx9DQyOXCd6Ll540MGOE2VRhBRNiz0k/jfhEAdbysWgrliS5Oh4rlmEGYpg8iHn95IseSyCtePYWNabqb2cXw/Z0FwhWws= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8P189MB1672.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(13003099007)(6133799003)(56012099006)(10067099003)(11063799006)(12006099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wf1knH5knQ1H0PvA7U+2EbZaX2VcVDNVu0gKXE4EEfPnLqkkqH3avtYqkxXw3yJNnqJM9ZjGhUaaDDYYElFlQi85HF4gUhKI1uidubTHCBPaRZuTIVA4YBGY74OCjVNRvxX8OmkPIVI8q7Ld4jLiHkHJ3GZG4WAkvCCg3UxZ0TbY1CywNfUWHiwO7+703xZRSSMaDUzq/qBErP6syoUsRAaTS0g/GuWn0gCxGAE1rZOhQnLBhqcJcN6/BmQdkYWVR+39e1k9Qgv3qMCWCXku80QYa9MPrlrG66nlYc3AtUunEjRHmAuwBKG3U19VH4bM1Hp+G2Qo5GgrR3+Q7c98anCS0m0dKgUdieXQR2bIQWEUqdPv/Hc7+0wIjv0aXr0i2z2+6J5gxkDY2jnfvgcxZeATBk0cbrXkzBPbfq2qKmERjefTH+pP+meYpN4gJta1N7zUCHvq6HvgSdAjOf4dLzFSAvrVxxvTjkYmyLprvGz3gnCO5TnMEQboocl82PuBSCsIi+lkks2Qdhvjn7XUw0o20R/hQ+TJvzy+q21NveoOjDXLXsUOkgOGSgDFPEsK+jUMdGBylhIqYYjUXwrzgzQOqfv/D8XhpTMvVTQ7o03ssXt1AfE8c14zcnmBvF0UGsIW3z1yQFweT8P/nlcPzwylpMJ2BvNVQlDV0OxBVeMAFOufgRwK4mg7ieNY5nOvoZ6ygYdWQjAM43412fwt5IsGnbOGBukDyihKgPJSIIgGhEdLM/Epkz6nL1rwVcsujAL3p/owtFj9aI6rimyEFPIfG3tUN9wiHRjTVxIS6xMtnyTebHiGuhAZrN4Qst6yjdyptn5RV5m6ei1TVUHyYjqY/MKAeZ5XKG2010lrHdoauRHL3VmEwU2RXuZVNp5fnbNN4fhIPb7xE5DsIIhobocn84m+CRFOV8MTthYBLNVdF9yeetEni/X1aLCgIeDK7b5XhSYNVveTf9fqUzHFG5kSmbu3wH7kzRtym2tell1uxNLMczQqaCjLxSDMCONNT8AaXhpO1RWEslgpdnzSt1332p/Z8nJs5KWFPtHxC/zOQwUZqbmTr5e3/PRlOHXUE0SZ9wpXAIRlvJclrPGe5NBgOnubc62t3voAmUaVUomUb6rU8hYT5y208SNyrQW336Vx4Lw81ROgZQTD8CfeOSs58x9cPz/xhBawj/JVZNtdE5+JYcPgAq8c8Spbo7JyQghqoDzjs2Oxz8maC1Ikkc3g2jlnUnBD3ImwWn6+HDHqG9QVQOTv6IS0abAegowipugTyx8u23vHHrAyFK3u05uDbCXRA0738Em9SjXfD+aWe8yfLPmKwMFestR8Dr1J7eyIvfyj4QGHr7wRQkOKaZJgVaz3qRlmVdpZfd4KG3EMaZKqzJ2XdScSNl3m/ykiIkYY0pVOSXRBuruMigsrVo4r8QZY5ir2+Z4Qt2EEXp/pr36v+sICR83LfGrC0lZHoO9kYWdKv5yJ4KrTfQmGjwQ93QjEeIlzgXcc81uW/zovhregW5hsL9kmMG9zLHHHKkeKqjGbiRpFpkoxf30cZsyTMeY0pBt2+/rYg9P+v+nKXVd8GdPQKXO5HFCR4BkxztfBlRj5MaRRBxOGsqBiUhOSLmJk3W0TXzfIWC65gSxemPi0+BzdlhqZ1tXlNv4Snvm5Zafv4NCyIbc6UcXZeZL/CTTg9Dyr5t6dkLZ+NIB8WbRA4Zk/fzd2ftQYs6rLTByQoV39kerJ2dJiIlElcB7tWUdAUxaYNBSUBl1A774WVYw+7CHv/RwxPYodvuhD X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 8d77855a-946f-4fea-9a89-08def169f099 X-MS-Exchange-CrossTenant-AuthSource: AS8P189MB1672.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 14:17:24.4521 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KtBqslgVLe5plaLtmvbfreJnwTXvt53sG1QMUkGTgBC1BVGNoq9K+RDfFr51u5vYIpwTJhXD3rd+aTkBamtqKDkKudXuL66f+qP91MLEwhU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P189MB1820 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 ; Mon, 03 Aug 2026 14:19:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128691 From: Adarsh Jagadish Kamini Backport patch to fix CVE-2026-58023. References: https://nvd.nist.gov/vuln/detail/CVE-2026-58023 Upstream fix: https://github.com/apache/thrift/commit/d68305a7308a11df2c1daef16f55dbc19dfa6ff0 Signed-off-by: Adarsh Jagadish Kamini --- .../thrift/thrift/CVE-2026-58023.patch | 231 ++++++++++++++++++ .../thrift/thrift_0.20.0.bb | 1 + 2 files changed, 232 insertions(+) create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-58023.patch diff --git a/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-58023.patch b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-58023.patch new file mode 100644 index 0000000000..f6cc703369 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-58023.patch @@ -0,0 +1,231 @@ +From 0459eb08472ea28695e0b78088ca7530ebc34238 Mon Sep 17 00:00:00 2001 +From: Javid Khan +Date: Fri, 26 Jun 2026 21:35:32 +0200 +Subject: [PATCH] copy buffered data not the GByteArray struct in c_glib + read_slow Client: c_glib + +thrift_framed_transport_read_slow copies leftover bytes from the previous frame with memcpy(buf, t->r_buf, t->r_buf->len), passing the GByteArray struct pointer as the source instead of t->r_buf->data. The correct source is the buffer's data member, as used by the other memcpy calls in the same file. thrift_buffered_transport_read_slow contains the same mistake in its leftover path. Both are updated to read from t->r_buf->data, and a regression test using a memory buffer exercises the cross-boundary read path in each transport. + +This closes #3607 + +CVE: CVE-2026-58023 +Upstream-Status: Backport [https://github.com/apache/thrift/commit/d68305a7308a11df2c1daef16f55dbc19dfa6ff0] + +Signed-off-by: Adarsh Jagadish Kamini +--- + .../transport/thrift_buffered_transport.c | 2 +- + .../transport/thrift_framed_transport.c | 2 +- + lib/c_glib/test/Makefile.am | 6 +- + lib/c_glib/test/testbufferedtransport.c | 47 ++++++++++++++ + lib/c_glib/test/testframedtransport.c | 62 +++++++++++++++++++ + 5 files changed, 115 insertions(+), 4 deletions(-) + +diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c +index 30aa95caf..21e3e42d4 100644 +--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c ++++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c +@@ -93,7 +93,7 @@ thrift_buffered_transport_read_slow (ThriftTransport *transport, gpointer buf, + /* first copy what we have in our buffer. */ + if (have > 0) + { +- memcpy (buf, t->r_buf, t->r_buf->len); ++ memcpy (buf, t->r_buf->data, t->r_buf->len); + want -= t->r_buf->len; + t->r_buf = g_byte_array_remove_range (t->r_buf, 0, t->r_buf->len); + } +diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c +index 3cbb245e0..8deed4119 100644 +--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c ++++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c +@@ -138,7 +138,7 @@ thrift_framed_transport_read_slow (ThriftTransport *transport, gpointer buf, + /* first copy what we have in our buffer, if there is anything left */ + if (have > 0) + { +- memcpy (buf, t->r_buf, t->r_buf->len); ++ memcpy (buf, t->r_buf->data, t->r_buf->len); + want -= t->r_buf->len; + t->r_buf = g_byte_array_remove_range (t->r_buf, 0, t->r_buf->len); + } +diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am +index f3a0c30df..71cfc7970 100644 +--- a/lib/c_glib/test/Makefile.am ++++ b/lib/c_glib/test/Makefile.am +@@ -150,7 +150,8 @@ testbufferedtransport_LDADD = \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \ +- $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_configuration.o ++ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_memory_buffer.o \ ++ $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_configuration.o + + testframedtransport_SOURCES = testframedtransport.c + testframedtransport_LDADD = \ +@@ -158,7 +159,8 @@ testframedtransport_LDADD = \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \ + $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \ +- $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_configuration.o ++ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_memory_buffer.o \ ++ $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_configuration.o + + testzlibtransport_SOURCES = testzlibtransport.c + testzlibtransport_LDADD = \ +diff --git a/lib/c_glib/test/testbufferedtransport.c b/lib/c_glib/test/testbufferedtransport.c +index d01806d61..7493b7222 100644 +--- a/lib/c_glib/test/testbufferedtransport.c ++++ b/lib/c_glib/test/testbufferedtransport.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' } + +@@ -306,6 +307,51 @@ test_write_fail(void) + } + } + ++/* A read larger than the bytes already sitting in the read buffer takes the ++ read_slow() path with have > 0. That leftover used to be copied from the ++ GByteArray structure itself rather than its data member, which corrupted the ++ result and over-read the small struct allocation once more than a handful of ++ bytes were buffered. Pre-load the buffer and drive the read through a memory ++ buffer so the path is exercised without a socket peer. */ ++static void ++test_read_across_buffer (void) ++{ ++ ThriftBufferedTransport *bt; ++ ThriftTransport *transport; ++ ThriftMemoryBuffer *membuf; ++ guchar leftover[96]; ++ guchar tail[4]; ++ guchar buf[100]; ++ gint32 got; ++ guint i; ++ ++ for (i = 0; i < sizeof (leftover); i++) ++ leftover[i] = (guchar) (0x10 + i); ++ for (i = 0; i < sizeof (tail); i++) ++ tail[i] = (guchar) (0xc0 + i); ++ ++ membuf = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 1024, NULL); ++ thrift_transport_write (THRIFT_TRANSPORT (membuf), tail, sizeof (tail), NULL); ++ ++ transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, ++ "transport", THRIFT_TRANSPORT (membuf), NULL); ++ ++ /* leave 96 bytes already buffered, more than sizeof(GByteArray) */ ++ bt = THRIFT_BUFFERED_TRANSPORT (transport); ++ g_byte_array_append (bt->r_buf, leftover, sizeof (leftover)); ++ ++ /* this read exceeds the buffered bytes and must return the real buffered ++ data followed by the freshly read tail, not the GByteArray structure */ ++ got = thrift_transport_read (transport, buf, 100, NULL); ++ g_assert (got == 100); ++ g_assert (memcmp (buf, leftover, 96) == 0); ++ g_assert (memcmp (buf + 96, tail, 4) == 0); ++ ++ thrift_transport_read_end (transport, NULL); ++ g_object_unref (transport); ++ g_object_unref (membuf); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -319,6 +365,7 @@ main(int argc, char *argv[]) + g_test_add_func ("/testbufferedtransport/OpenAndClose", test_open_and_close); + g_test_add_func ("/testbufferedtransport/ReadAndWrite", test_read_and_write); + g_test_add_func ("/testbufferedtransport/WriteFail", test_write_fail); ++ g_test_add_func ("/testbufferedtransport/ReadAcrossBuffer", test_read_across_buffer); + + return g_test_run (); + } +diff --git a/lib/c_glib/test/testframedtransport.c b/lib/c_glib/test/testframedtransport.c +index 008e61e40..581b71067 100644 +--- a/lib/c_glib/test/testframedtransport.c ++++ b/lib/c_glib/test/testframedtransport.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' } + +@@ -305,6 +306,66 @@ thrift_server (const int port) + g_object_unref (tsocket); + } + ++/* append a framed message (4-byte big-endian size header + body) */ ++static void ++append_frame (GByteArray *wire, const guchar *data, guint32 len) ++{ ++ guint32 netlen = htonl (len); ++ g_byte_array_append (wire, (const guchar *) &netlen, 4); ++ g_byte_array_append (wire, data, len); ++} ++ ++/* A read whose length crosses a frame boundary takes the read_slow() path ++ while bytes are still buffered from the previous frame. That leftover used ++ to be copied from the GByteArray structure itself rather than its data ++ member, corrupting the result and over-reading the heap once more than a ++ handful of bytes remained. Drive it through a memory buffer so the path is ++ exercised without a socket peer. */ ++static void ++test_read_across_frames (void) ++{ ++ guchar f1[100]; ++ guchar f2[100]; ++ guchar buf[100]; ++ gint32 got; ++ guint i; ++ ++ for (i = 0; i < sizeof (f1); i++) ++ { ++ f1[i] = (guchar) (0x10 + i); ++ f2[i] = (guchar) (0xc0 + i); ++ } ++ ++ GByteArray *wire = g_byte_array_new (); ++ append_frame (wire, f1, sizeof (f1)); ++ append_frame (wire, f2, sizeof (f2)); ++ ++ ThriftMemoryBuffer *membuf = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, ++ "buf", wire, ++ "buf_size", (guint32) 0, ++ NULL); ++ ThriftTransport *transport = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, ++ "transport", ++ THRIFT_TRANSPORT (membuf), ++ NULL); ++ ++ /* consume part of the first frame so 96 bytes stay buffered */ ++ got = thrift_transport_read (transport, buf, 4, NULL); ++ g_assert (got == 4); ++ g_assert (memcmp (buf, f1, 4) == 0); ++ ++ /* this read spans into the second frame and must return the real buffered ++ bytes, not the bytes of the GByteArray structure */ ++ got = thrift_transport_read (transport, buf, 100, NULL); ++ g_assert (got == 100); ++ g_assert (memcmp (buf, f1 + 4, 96) == 0); ++ g_assert (memcmp (buf + 96, f2, 4) == 0); ++ ++ thrift_transport_read_end (transport, NULL); ++ g_object_unref (transport); ++ g_object_unref (membuf); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -318,6 +379,7 @@ main(int argc, char *argv[]) + g_test_add_func ("/testframedtransport/OpenAndClose", test_open_and_close); + g_test_add_func ("/testframedtransport/ReadAndWrite", test_read_and_write); + g_test_add_func ("/testframedtransport/ReadAfterPeerClose", test_read_after_peer_close); ++ g_test_add_func ("/testframedtransport/ReadAcrossFrames", test_read_across_frames); + + return g_test_run (); + } diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb index 23a6debf9a..35482d2471 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb @@ -13,6 +13,7 @@ SRC_URI = "https://archive.apache.org/dist/${BPN}/${PV}/${BP}.tar.gz \ file://0001-thrift-pr2755.patch \ file://0001-THRIFT-5842-Add-missing-cstdint-include-for-int64_t-.patch \ file://CVE-2026-55971.patch \ + file://CVE-2026-58023.patch \ " SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6" From patchwork Mon Aug 3 14:17:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adarsh Jagadish Kamini X-Patchwork-Id: 94327 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 C2708C55182 for ; Mon, 3 Aug 2026 14:19:18 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.66.1]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.44172.1785766647382335015 for ; Mon, 03 Aug 2026 07:17:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=Gow5UhvI; spf=pass (domain: est.tech, ip: 52.101.66.1, mailfrom: adarsh.jagadish.kamini@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L23rabZmKerS+i6bg3a1Mq4L4f5/DQBegm/lSyrKRmisB92nK6Vz5BClOgJYdoj+/IngFEnVlzSl35DPMjHlfPjjvpAK6p1S+TXtuyl3X0qAmEucsfbB2sSXPnFuhN5dvSJlmryJsI4rVseqL6d55lI6EcLAy3wGaCIKz3Vw99aD0GZkrWZK1AgcgoqZB15cujKlwaueL35rGI2ROcp7Om5FrsMW6qEh8HtpA3alxKp5awfglwLZvJNNrUk/FqDikrwsjJia5MdaUoxevLNYgviTjrzAbu02LowXNAcn12ho1xWpKkwT5qpzp+SFZsdLOQ/rPcvoGp5kGsUx/coCqQ== 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=+p8aK5fyo1zc6tdJjVXL+uIkz6vgTzzArLknJBePU/g=; b=yX9p0UgWXvliSRV5PP+FFqfdkNmIaLGTsaRyLxsngJLET/dzMJ6bdrBjOaOBy9LZgQb8Tp4+QRH5XffkXT6npc75pJZa/tkjkHdSzGfgnesPjprsPyNFfLZ6Dy+mZcBvhZX7JCza6k6FxiJ8+EZlnc+sphIINBDuWiTiRvr36gk7RRQof3RxnDy2CpJBwPNsJKxCovKAlOroqDcJwgTuvMg6w3REiKt0IQqhwlm0fmaHQ/iYVqCmJz8PM7Xo001lDfX0s+fmMjfhPKfGr16m29+DVq+T2sEEm2rQKOSH75X1cAbBeeztgeLImOgoRu9RdVUPM5vloha9rsfir2O8pg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+p8aK5fyo1zc6tdJjVXL+uIkz6vgTzzArLknJBePU/g=; b=Gow5UhvIrz5tBuMOBE6hjxz3/Xm8HRxK1daVVgEA1sc2/h9j1SxzgEafWy6EvSLamespdBa21pHZAzSuXHfJsN5sR54yf46F1/QlKLtV80al7r33jhusYZwBxpbLiZwmUahgHAoqNghItui2KjcsiAsIrYNwTb+ZqUFPhnALS+p/HEVbMJO4d8Hnvp47gVy1Gn84d3xHTI/7FecBAHvVvkkAq4IVB2dvoJSh2MmyK9A24yb80u039XQgJhiMHVm+daoASM9m64A7KLPZp1zb/c3elCMJ6b3bPXiDCkpgDJ0/xQPS6iICd1g14nEM/n2Qos4JD1/EdIk5Pb6nRPanvA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) by DU0P189MB1820.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:344::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.13; Mon, 3 Aug 2026 14:17:26 +0000 Received: from AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff]) by AS8P189MB1672.EURP189.PROD.OUTLOOK.COM ([fe80::f147:85e5:34de:eeff%4]) with mapi id 15.21.0292.012; Mon, 3 Aug 2026 14:17:26 +0000 From: "Adarsh Jagadish Kamini" To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][scarthgap][PATCH 3/3] thrift: fix CVE-2026-48144 Date: Mon, 3 Aug 2026 16:17:12 +0200 Message-ID: <20260803141716.853285-4-adarsh.jagadish.kamini@est.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> References: <20260803141716.853285-1-adarsh.jagadish.kamini@est.tech> X-ClientProxiedBy: DU2PR04CA0326.eurprd04.prod.outlook.com (2603:10a6:10:2b5::31) To AS8P189MB1672.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:396::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P189MB1672:EE_|DU0P189MB1820:EE_ X-MS-Office365-Filtering-Correlation-Id: d519952d-71d0-4e58-cfba-08def169f188 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|13003099007|56012099006|10067099003|11063799006|12006099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: fyorCwcEdCN7huLlzBgzkqZahl0Has6+X8CULAg2YbxgYjIZ6FIGOaQv4M/vWZ8cU755uPkBmTt+7y0fVdqd/3VMSHv45FmwhqQqk5d0dily6xx0m2NzMMVTPJrsTzGI98oU0ElHuYMDpiJvapaIWAdz7f/ZxLKZFycFW+sC5m7nGu0H2h+HV2ISN9f+83Q1fJzxmqpn6wHKpWsiL7Q8hC8LoRH5XXGVSzdW5Bqor6NiSkOJFL76Hj29EJqPxYApbAh6zRZxMP71gA2MMfO8QvgNf2OOXqKJOrrY+vrHU2WAADQNtgbP+ypA6VXTN5GdlRe2gYdI3EaVu542O+Fjgy0xQIyUQiuxyodF9LK3tFoIguSTcOubKLvL5gcMNDALoZ4Kana0L3/GO9VVKwYe9/lD5jxi9wFO2sKcEOMTRrqI4whDb/GW/qFMYcc/6EwFsUP4iScwWd6hI8SqqG/kStgAuy0xc1JMKkbh1OsbTnycyD+lyaTqFrhDExqj+bpDTrZ507zKNCA8GaZYIltfKwoGn+rt7DdgYXaVflv7mO5HhmBd6cqkpXf7qnqZ8Lw7y1fS5CSQefZJyAFp+/Fa7z60mr8PWX6moWebrr9+3mAHJUYDFDjkGddp8qgZ0C/3UOwpvK2PkrL+YdHq89TjGhriYLTX3Z6ws2D07klB6w0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8P189MB1672.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(13003099007)(56012099006)(10067099003)(11063799006)(12006099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cEkMXPQXX/7/ckJMhBNWZnaOkUMulEtBxR2Be44VdfZAcvKm8qizTnX94Nn1CzdhkNCb9Iw1EvjkKQTFyBicjyZ/gnSOSvhEcJfmgjQV87Uyt6J+mPqmF10F6MQNyJqhhvlhChJVNfsuni+5Dm75u+SQqQ5SWBWpa+8GBsN9ZmR7MJYOGjwxMPAYQj9o96hxh37hO5YLvSm5ileZ0UUtvnBPbtTDFgVTpYzsKMWvcTkyvBozXOGkVWZlDUpp1imQxjY3sy8NGG3sHpcqEFrOjHmKomyYA+nNDErcXH4McRpMWZNg5/rZT5cT71LglqOwY0+vXEm3RSEK094/6t7NbHQJNPva1AbeG5T7NOEcNcyl+Vq5+YkiR7dKJV/55wP2rvoSdh6KvlQ9Ra6aT6J0djXX5PIYqEoxWhqDbvdDi2XMUMzQknOcHW4dlhWB02VJm3LdvhlspspE4SRXG4YTMsYENtTRElRpjTcj4z4f4QYAL/jzE+uMVfwxLL2VgenrzXZTwF7P20jWY8NCGgU64DOPZpIy2GO7JshMLPApXJ30CRi+d/4pyZlB5xXf6WfCoPjCkBp6bAz2ycozmp33Fw5rSvCRBoDZ6QdF+xZcmnzf50nA2dY1+RZu5A1By8auRCns0bwQHvg/b8SP0VM1X8JggLOieLxIJOUimBdE81STAfR7JuMOT+BtR3JxWWLUj5ooocq9GAUR+kXcm2Yg9ydn7mukpm1AXc+aE5dLg/3uHEOxxmL44ZX28o05tbYwZQfxWbRIqHwDOaESXddggSJVHt9vNgRL+8RAVkoOqmU18bmRKFr1L2Tuh3Pi3qNztmIDaYyguhUrvle+zOz1xL/4CQuChsBL8E/YHmds+DA0HmZ1pKHlTe7LX56sStXqD/gqWDvZtJFDnUntoaMtsNo8qYrroMej6nQLP5RprolW8Y33madVt8Er5cdrFp8EAut+eJe6wibh2EFW5/wtnD4qvxdIMBzVIggXPxfZwKj0w0Rr2Mgr2czuq5AzgjXLfJFfjG3VWccS7VWk9o4xBQlOO0oNDFOOyuZ4Bji2SbK59xbCqdE+8O+m+nPeEDGXqpgPonSIU83NuncpUpEtrdnuYSRPTIMCqnlwLZ1kCInLOBSx7Uzw7/dilqijcTfXu5KR2IHFzEmYt66H5O1qeYSFngaek/+76IyMReCy2Q5d+CllFYXm+tZOjJx87jmQK2jg6fh1ZlTT2pe44D3KmuOKVqJz1W9fwk2NNc/1dbcJP1AjMhL09mqjdVyleki3tzANXLyz/MfOKSkqqo3PaYr4Pc49aXbRgWIKa51NpIGLfXBJz0HyY1bVTSHy5RzLdxz9PfHQL4ItL9drVra1PsqYQ8lVn9lfBtLRvO5rTyJ2w4lK/ORzlZRhCjqtKzEXh5GF+FYDys1KxMvUnU4BtzdFokDid1PxI1E4qjjHbKmlKZqhpQiL0sGZU06pTpIzTBm6xBmZmAA5B85p305biY3rtWuEL8+pE1oKYGfbD1C/co3DeX4X1EU+Df3WyJUh99B1r8JVBf+wa69GUPtj2RRARLOjXdrJCZh4d6b75IFCa4V+sua2iiwa3GN+sTjV9R/fhew9FFgEP18++ffeabBoFTqHnQBsG3tpum2ehKSMwlVMxRDSVfVZ49ewDGZ+RUf4lEVnbtiE6cxXg3/J+vST9mVNj22eLh31Y/K0Dh+lvzvsje3zLsbCw6TjqCGx/GnjJR3tOiDrRue5MOB883ta+tvhAGo73qkG/1IEO6CdaTzvTIqk87USmpDjiRG8 X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: d519952d-71d0-4e58-cfba-08def169f188 X-MS-Exchange-CrossTenant-AuthSource: AS8P189MB1672.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2026 14:17:25.9943 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Mvck6JUtML1Xq8/3c9cFzU20LQuLoPYe1Gf+N3eAIBCJNzvPT2JPLrnrgwtr//bIShxC1YoHLiN8hUql3QTj3VA3CToGo5CvsjGSRLjaWGk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P189MB1820 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 ; Mon, 03 Aug 2026 14:19:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128692 From: Adarsh Jagadish Kamini Backport patch to fix CVE-2026-48144. References: https://nvd.nist.gov/vuln/detail/CVE-2026-48144 Upstream fix: https://github.com/apache/thrift/commit/2b8baabc9be52807b08825e825bc0cd26568a193 Signed-off-by: Adarsh Jagadish Kamini --- .../thrift/thrift/CVE-2026-48144.patch | 36 +++++++++++++++++++ .../thrift/thrift_0.20.0.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-48144.patch diff --git a/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-48144.patch b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-48144.patch new file mode 100644 index 0000000000..531fb5a52e --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift/CVE-2026-48144.patch @@ -0,0 +1,36 @@ +From 392027cd14deaa7b37d72e1608b57024a1056757 Mon Sep 17 00:00:00 2001 +From: Jens Geyer +Date: Thu, 21 May 2026 03:05:53 +0200 +Subject: [PATCH] Add peer hostname validation to c_glib TLS client Client: + c_glib + +Sets SSL_set1_host() before SSL_connect() so the peer certificate CN/SAN +is validated against the hostname. Guarded with OPENSSL_VERSION_NUMBER +>= 0x10100000L since SSL_set1_host() was introduced in OpenSSL 1.1.0. + +Co-Authored-By: Claude Sonnet 4.6 + +CVE: CVE-2026-48144 +Upstream-Status: Backport [https://github.com/apache/thrift/commit/2b8baabc9be52807b08825e825bc0cd26568a193] + +Signed-off-by: Adarsh Jagadish Kamini +--- + lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c +index 0afcb1b8f..4423a781c 100644 +--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c ++++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c +@@ -422,6 +422,11 @@ thrift_ssl_socket_handle_handshake(ThriftTransport * transport, GError **error) + if(ssl_socket->server){ + rc = SSL_accept(ssl_socket->ssl); + }else{ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ if (socket->hostname != NULL) { ++ SSL_set1_host(ssl_socket->ssl, socket->hostname); ++ } ++#endif + rc = SSL_connect(ssl_socket->ssl); + } + if (rc <= 0) { diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb index 35482d2471..20afa8ce59 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb @@ -14,6 +14,7 @@ SRC_URI = "https://archive.apache.org/dist/${BPN}/${PV}/${BP}.tar.gz \ file://0001-THRIFT-5842-Add-missing-cstdint-include-for-int64_t-.patch \ file://CVE-2026-55971.patch \ file://CVE-2026-58023.patch \ + file://CVE-2026-48144.patch \ " SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6"