From patchwork Fri Oct 16 07:46:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101061 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 1C9A1CC6B38 for ; Fri, 16 Oct 2026 07:46:47 +0000 (UTC) Received: from rcdn-iport-9.cisco.com (rcdn-iport-9.cisco.com [173.37.86.80]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16843.1792136805446369542 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=cqJ+QjaO; spf=pass (domain: cisco.com, ip: 173.37.86.80, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=10698; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IYcYlcK1l9Yw9DncCsBM1UJ64PpSxBqRrLtmsau/mEQ=; b=cqJ+QjaOrQzJ2PuJ9oWXkH2lnEu8mIVXwvkDhV5W+++Z/ALKq9BKYgao pI1oU2jcF0kWLVPwmP/IPONf1uDQ7Miu8gYGwP/jmxsaCNai8DeQ3MGFO PXj8mMfw7bQoZ+VnoWy7klyo6qpcItNskFnoTjN77p2+54DUQom5X6sOV M+7a/oSuDQNd0jjnFHbueNyoAf0v/zyG5hkycO1WFk9Muuls46HBqAfCa mdL8R3gsQCttNfjdz0ujxXdKlMRWIUtZw4HbsH0vj6nqnBN0IfUCHRLSs e0EjhTZTJuXGA+Pf+vJgaIY9t/cOZxK2LXF3CDCv32rc3dPYD9WVzp2k+ g==; X-CSE-ConnectionGUID: mLpZf34aT2e3KGiYz+nIvw== X-CSE-MsgGUID: BsWzvpB+RxGwVo0q4spesQ== X-IPAS-Result: A0BHAgAY1NFq/5H/Ja1aHgEBCxIMggULgld1YENJlV5sA54cgX4PAQEBD0QNBAEBhQUCjhUCJjQJDgECBAMCAwEBAQEBAQEBAQEBAQoBAQUBAQECAQcFgQ4Thk8NkBIBAgEDJwsBRhAcAwECJAsrIwgZgwIBgnQDEb0hgXkzgQGDaQJD3AIBCxQBgTiFQIgjXRgBhHwnGxuBcoEVg2mBBYFcAQGBJxuGQSIEgiKBDIFaHpUpSIEeA1ksAVUTDQoLBwWBaAM1EioVbjIdgSM+F4EHGwYFgR2BIIIWIxk2eoEJXoErKWABEBeBCYIHAoJUggACAUlBDgdFUwklQxJHJiIIEgkBExowC4EbODwJKEEXDHMMHQVyCAINCQcpGA1IESw3FRkEPm4HkhQegkUZBwEwShMBExcBIIFNMkeSdJJHgTWfWgoog3aMIpU6GjOFW6UUC5h9jgqWT4RpgWg8gSgbBAsHcBWDIglKGQ+OKwMBCgscg0SBf8xbJzICCTIBAQcCBw4DC4FokAACJgeBTwEB IronPort-Data: A9a23:F1QfKa8JcGD+cRT7y1v4DrUD0H+TJUtcMsCJ2f8bNWPcYEJGY0x3y GEfWW3TOPaJMWagetBwbIq3pxgHvJ/QxtAxHABs/C1EQiMRo6IpJzg2wmQcns+2BpeeJK6yx 5xGMrEsFOhtEDmB4E/rbei5xZVF/fngbqLmD+LZMTxGSwZhSSMw4TpugOdRbrRA2bBVOCvT/ 4mtyyHjEAX9gWAtajtKs/vrRC5H5ZwehhtJ5jTSWtgT1LPuvyF9JI4SI6i3M0z5TuF8dsamR /zOxa2O5WjQ+REgELuNyt4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5nXBYoUnq7vh3S9zxHJ HqhgrTrIeshFvWkdO3wyHC0GQkmVUFN0OevzXRSLaV/wmWeG0YAzcmCA2kzGZUq9L0rCF0U+ Kc7BzE8fFOFpvyplefTpulE3qzPLeHxN48Z/3UlxjbDALN+EdbIQr7B4plT2zJYasJmRKmFI ZFGL2AyMVKZP0An1lQ/UPrSmM+khXT7ejxJoXqepLE85C7YywkZPL3FbYGIIYPWFJgJ9qqej kjdwHbnGjtZDsyw1gSCqmvwnffChhquDer+E5X9rJaGmma7wXQeDhATX1a3rfS1z0KzRd9bA 0gV4TY1668q+UqmS9PwUxG1rDiDpBF0ZjZLO/cx5AfIzu/f5ByUQzBUCDVAc9ch8sQxQFTGy 2O0oj8gPhQ32JX9dJ5X3u78Qe+aUcTNEVI/WA== IronPort-HdrOrdr: A9a23:FZk+TK5BEQZfVGv7JgPXwOrXdLJyesId70hD6qm+c3Nom6uj5q eTdZsgtCMc5Ax9ZJhko6HjBEDiewK5yXcK2+ks1N6ZNWGM0ldAbrsSiLcKqAePJ8SRzIJgPN 9bAstDIey1K0RmhsDn5wT9OdMhzN6btJ2Mv47lvhFQpcUAUdAZ0++/YTzra3FLeA== X-Talos-CUID: 9a23:7l8i6W3A+fBw5z9/4VMZWLxfH+Q9QHOGkH7seULjKkloea/WT36O5/Yx X-Talos-MUID: 9a23:lITxbQZhLKTyh+BTnSTTli96HoRS84uxNkdViMkdo8SfDHkl X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="535374954" Received: from rcdn-l-core-08.cisco.com ([173.37.255.145]) by rcdn-iport-9.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-08.cisco.com (Postfix) with ESMTPS id 5834218000443; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id F3CA4CBF201; Fri, 16 Oct 2026 00:46:43 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 1/7] ntfs-3g-ntfsprogs: fix CVE-2026-46572 and CVE-2026-42617 Date: Fri, 16 Oct 2026 00:46:34 -0700 Message-Id: <20261016074640.3986037-2-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-08.cisco.com 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, 16 Oct 2026 07:46:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131075 From: Darsh Kelaiya This patch applies the upstream fixes shown in [1], [2], and [3]. The NVD records describing the vulnerabilities are referenced in [4] and [5]. [1] https://github.com/tuxera/ntfs-3g/commit/2ead8a3ccf940c0219ffba587fab54e21462b3a5 [2] https://github.com/tuxera/ntfs-3g/commit/dfd1a7c6eb23a22238ec193451fa59c989b4381f [3] https://github.com/tuxera/ntfs-3g/commit/edf2b892356684ca8f2fc5898943c7a9b90ffb80 [4] https://nvd.nist.gov/vuln/detail/CVE-2026-46572 [5] https://nvd.nist.gov/vuln/detail/CVE-2026-42617 Signed-off-by: Darsh Kelaiya --- .../CVE-2026-46572_CVE-2026-42617_p1.patch | 66 +++++++++++ .../CVE-2026-46572_CVE-2026-42617_p2.patch | 104 ++++++++++++++++++ .../CVE-2026-46572_CVE-2026-42617_p3.patch | 35 ++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 3 + 4 files changed, 208 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p1.patch create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p2.patch create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p3.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p1.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p1.patch new file mode 100644 index 0000000000..47121ea9a5 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p1.patch @@ -0,0 +1,66 @@ +From 7a3fccddc2bca7609fd6597fcb6ea8a42a258937 Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Fri, 24 Apr 2026 13:00:30 +0300 +Subject: [PATCH] index.c: Validate the size of data copied from root to index + block. + +If the last entry extends beyond the index block size, we could copy +more bytes than allocated into the index block, overflowing its +allocation. Fixed by adding a bounds check prior to the memcpy, emitting +an error message and returning NULL with errno == EIO as this is an +inconsistency. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-46572 CVE-2026-42617 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/2ead8a3ccf940c0219ffba587fab54e21462b3a5] + +(cherry picked from commit 2ead8a3ccf940c0219ffba587fab54e21462b3a5) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/index.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/libntfs-3g/index.c b/libntfs-3g/index.c +index e48d6aaf..2739594b 100644 +--- a/libntfs-3g/index.c ++++ b/libntfs-3g/index.c +@@ -1091,14 +1091,16 @@ out: + + static INDEX_BLOCK *ntfs_ir_to_ib(INDEX_ROOT *ir, VCN ib_vcn) + { ++ u32 ib_size; + INDEX_BLOCK *ib; + INDEX_ENTRY *ie_last; + char *ies_start, *ies_end; + int i; + + ntfs_log_trace("Entering\n"); +- +- ib = ntfs_ib_alloc(ib_vcn, le32_to_cpu(ir->index_block_size), LEAF_NODE); ++ ++ ib_size = le32_to_cpu(ir->index_block_size); ++ ib = ntfs_ib_alloc(ib_vcn, ib_size, LEAF_NODE); + if (!ib) + return NULL; + +@@ -1110,6 +1112,18 @@ static INDEX_BLOCK *ntfs_ir_to_ib(INDEX_ROOT *ir, VCN ib_vcn) + * as well, which can never have any data. + */ + i = (char *)ie_last - ies_start + le16_to_cpu(ie_last->length); ++ ++ if (offsetof(INDEX_BLOCK, index) + le32_to_cpu(ib->index.entries_offset) ++ + i > ib_size) ++ { ++ ntfs_log_error("Last entry in index root overflows the index " ++ "block size: %d (index block size: %lu)\n", ++ i, (unsigned long)ib_size); ++ free(ib); ++ errno = EIO; ++ return NULL; ++ } ++ + memcpy(ntfs_ie_get_first(&ib->index), ies_start, i); + + ib->index.ih_flags = ir->index.ih_flags; diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p2.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p2.patch new file mode 100644 index 0000000000..d2d40124fe --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p2.patch @@ -0,0 +1,104 @@ +From 51475eab2d2a559e10a8d3772d56444feffc13a4 Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Mon, 8 Jun 2026 09:27:45 +0300 +Subject: [PATCH] Validate index entry stream while reading from disk. + +Add ntfs_ie_stream_inconsistent() to walk the IE stream once and verify +every entry: header fits, length is sane and 8-byte aligned, entry fits, +and the END entry terminates the stream exactly. Call it from +ntfs_attr_inconsistent() for INDEX_ROOT and from +ntfs_index_block_inconsistent() for INDX blocks so callers can rely on +the IE stream being well-formed. + +CVE: CVE-2026-46572 CVE-2026-42617 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/dfd1a7c6eb23a22238ec193451fa59c989b4381f] + +(cherry picked from commit dfd1a7c6eb23a22238ec193451fa59c989b4381f) +Signed-off-by: Darsh Kelaiya +--- + include/ntfs-3g/index.h | 1 + + libntfs-3g/attrib.c | 3 +++ + libntfs-3g/index.c | 37 ++++++++++++++++++++++++++++++++++++- + 3 files changed, 40 insertions(+), 1 deletion(-) + +diff --git a/include/ntfs-3g/index.h b/include/ntfs-3g/index.h +index d001863a..1d5845d4 100644 +--- a/include/ntfs-3g/index.h ++++ b/include/ntfs-3g/index.h +@@ -143,6 +143,7 @@ extern int ntfs_index_block_inconsistent(const INDEX_BLOCK *ib, u32 block_size, + u64 inum, VCN vcn); + extern int ntfs_index_entry_inconsistent(const INDEX_ENTRY *ie, + COLLATION_RULES collation_rule, u64 inum); ++extern int ntfs_ie_stream_inconsistent(const INDEX_HEADER *ih, u64 inum); + extern int ntfs_index_lookup(const void *key, const int key_len, + ntfs_index_context *ictx) __attribute_warn_unused_result__; + +diff --git a/libntfs-3g/attrib.c b/libntfs-3g/attrib.c +index efb91943..ad9ebceb 100644 +--- a/libntfs-3g/attrib.c ++++ b/libntfs-3g/attrib.c +@@ -3542,6 +3542,9 @@ int ntfs_attr_inconsistent(const ATTR_RECORD *a, const MFT_REF mref) + (long long)inum); + errno = EIO; + ret = -1; ++ } else if (ntfs_ie_stream_inconsistent(&ir->index, inum)) { ++ errno = EIO; ++ ret = -1; + } + break; + case AT_STANDARD_INFORMATION : +diff --git a/libntfs-3g/index.c b/libntfs-3g/index.c +index 2739594b..c9651a62 100644 +--- a/libntfs-3g/index.c ++++ b/libntfs-3g/index.c +@@ -504,6 +504,8 @@ int ntfs_index_block_inconsistent(const INDEX_BLOCK *ib, u32 block_size, + (unsigned long long)inum); + return -1; + } ++ if (ntfs_ie_stream_inconsistent(&ib->index, inum)) ++ return -1; + + return (0); + } +@@ -560,7 +562,40 @@ int ntfs_index_entry_inconsistent(const INDEX_ENTRY *ie, + return (ret); + } + +-/** ++int ntfs_ie_stream_inconsistent(const INDEX_HEADER *ih, u64 inum) ++{ ++ const u8 *ies_start = (const u8 *)ih + le32_to_cpu(ih->entries_offset); ++ const u8 *ies_end = (const u8 *)ih + le32_to_cpu(ih->index_length); ++ const u8 *ie; ++ ++ ntfs_log_trace("Entering\n"); ++ ++ for (ie = ies_start; ie < ies_end; ) { ++ u32 len; ++ const INDEX_ENTRY *ent = (const INDEX_ENTRY *)ie; ++ ++ if ((size_t)(ies_end - ie) < sizeof(INDEX_ENTRY_HEADER)) ++ goto err; ++ len = le16_to_cpu(ent->length); ++ if (len < sizeof(INDEX_ENTRY_HEADER) || (len & 7)) ++ goto err; ++ if ((size_t)(ies_end - ie) < len) ++ goto err; ++ if (ent->ie_flags & INDEX_ENTRY_END) { ++ /* END must terminate the stream exactly. */ ++ if (ie + len != ies_end) ++ goto err; ++ return 0; ++ } ++ ie += len; ++ } ++err: ++ ntfs_log_error("Corrupt index entry stream in inode %lld\n", ++ (long long)inum); ++ return -1; ++} ++ ++/** + * Find a key in the index block. + * + * Return values: diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p3.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p3.patch new file mode 100644 index 0000000000..54bce4f95e --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46572_CVE-2026-42617_p3.patch @@ -0,0 +1,35 @@ +From c8630e735204fd4ed4b49c4dc315716664b965c1 Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Mon, 8 Jun 2026 09:57:11 +0300 +Subject: [PATCH] Validate INDEX_ROOT.index_block_size from disk. + +Reject INDEX_ROOT attributes whose index_block_size is smaller than +NTFS_BLOCK_SIZE or not a power of two. Same rule the driver already +applies at libntfs-3g/dir.c. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for the report. + +CVE: CVE-2026-46572 CVE-2026-42617 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/edf2b892356684ca8f2fc5898943c7a9b90ffb80] + +(cherry picked from commit edf2b892356684ca8f2fc5898943c7a9b90ffb80) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/attrib.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libntfs-3g/attrib.c b/libntfs-3g/attrib.c +index ad9ebceb..cfc2446e 100644 +--- a/libntfs-3g/attrib.c ++++ b/libntfs-3g/attrib.c +@@ -3528,6 +3528,10 @@ int ntfs_attr_inconsistent(const ATTR_RECORD *a, const MFT_REF mref) + if (a->non_resident + || (le32_to_cpu(a->value_length) + < offsetof(INDEX_ROOT, index.reserved)) ++ || (le32_to_cpu(ir->index_block_size) ++ < NTFS_BLOCK_SIZE) ++ || (le32_to_cpu(ir->index_block_size) ++ & (le32_to_cpu(ir->index_block_size) - 1)) + || (le32_to_cpu(ir->index.entries_offset) + < sizeof(INDEX_HEADER)) + || (le32_to_cpu(ir->index.index_length) diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 37a8106bb0..8995807d95 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ + file://CVE-2026-46572_CVE-2026-42617_p1.patch \ + file://CVE-2026-46572_CVE-2026-42617_p2.patch \ + file://CVE-2026-46572_CVE-2026-42617_p3.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101065 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 8E5AECCF2C0 for ; Fri, 16 Oct 2026 07:46:48 +0000 (UTC) Received: from rcdn-iport-8.cisco.com (rcdn-iport-8.cisco.com [173.37.86.79]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16491.1792136805379095577 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=SrusRPJc; spf=pass (domain: cisco.com, ip: 173.37.86.79, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=3609; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j4OPatR0Ns+lme+KsgIoVefDd/bI5sTJAw2R61BYJnE=; b=SrusRPJcNPSrAMEy2ne9X5yz5KrVcqx4z7mFhL9yrQX/6hAbJjhRTBhP 6WXwxLkrloZngyw63m0DiZAy8oXNSvowk61Jftn/hAj4WRQ0pq/P848/D ElBLKdQ2YZ6KPssYqbc73T8bdgRktTYTV1kZCPFWo8affv0WGYzdQ+UkK niN7tHSfoS+9fLLjo2s75RfigqE07MD2UwhF7zJZIob7SB+CIL6hEQS/0 +AiNtHeHrjn+spdWCkYDYXHAJw0RMKUVnHxAIVJ6qZD+rWHDGR1Wno2/e VhprP9p9DwvEvRzUNyvJG70PHW0lKYK8dkkiU7Zg4b3X0j9oPH7oLJwlB g==; X-CSE-ConnectionGUID: zvX7Mi9zSnK8UvF+m41tsg== X-CSE-MsgGUID: PorDo0S1T2OvYuYPkadW7w== X-IPAS-Result: A0BHAgAh1tFq/4//Ja1aHgEBCxIMggULgld1YENJlkoDnhyBfg8BAQEPRA0EAQGFBQKOFQImNAkOAQIEAwIDAQEBAQEBAQEBAQEBCgEBBQEBAQIBBwWBDhOGTw2QEgECAQMnCwFGEBwDAQIvKyMIGYMCAYJ0AxG9IIF5M4EBg2kCQ1DbMgELFAGBOIVAiCNdGAGEfCcbG4FyhAh2gQWBXAEBiAMiBIIigQyBWh6VKUiBHgNZLAFVEw0KCwcFgWgDNRIqFW4yHYEjPheBBxsGBYEdgSCCFiMZNnqBCV6BKylgARAXgQmCBwKCVIIAAgFJQQ4HRVMJJUMSRyYiCBIJARMaMAuBGzg8CShBFwxzDB0FcggCDQkHKRgNSBEsNxUZBD5uB5IUHoJeBwGBDQEqASCBTKQUgiGhDwoog3aMIpU6GjOEBIFXkkCSVAuYfY4Klk+EaYFoPIFHCwdwFYMiCUoZD44rDgscg0SBf8xbJzICCTIBAQcCBw4DC4FokX4BAQ IronPort-Data: A9a23:kwb1rKwskVGYAzxruwl6t+dnxyrEfRIJ4+MujC+fZmUNrF6WrkUAy jMfCDjVP6uKamr8eY1wPI3g9xhQsZ+ExtRgHlZur1hgHilAwSbn6Xt1DatR0we6dJCroJdPt p1GAjX4BJlqCCKa/lHyYuCJQUBUjcmgXqD7BPPPJhd/TAplTDZJoR94kobVuKYw6TSCK13L4 4yaT/H3Ygf/hWcsazxMsspvlTs21BjMkGJA1rABTagjUG/2zxE9EJ8ZLKetGHr0KqE8NvK6X evK0Iai9Wrf+Ro3Yvv9+losWhRXKlJ6FVHmZkt+A8BOsDAbzsAB+vpT2M4nVKtio27hc+adZ zl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CCe5xWuTpfi/xlhJFMoDdI9+7dlOmdtp cEGBnMIMkmfnO3jldpXSsE07igiBNPgMIVavjRryivUSK54B5vCWK7No9Rf2V/chOgXQq2YP JVfM2cyKk2cOHWjOX9PYH46tOuri332cixRgFmUvqEwpWPUyWSd1ZCwaoqMI4TUH549ckCwn mXc02OhOUgmbvuB+Ce0ynGlitCQgnauMG4VPPjinhJwu3WU3mEVBRgcWFe3rPX8hkOgVtZ3L 00P5jFoqrA/8kGuRNTxUxC05nmesXYht8F4CeY27kSJj6HT+QvcXjZCRT9aY9tgv8gzLdA36 mK0cxrSLWQHmNWopbi1r994cRva1fApEFI/ IronPort-HdrOrdr: A9a23:6GgfxK5QPn3P2idB1QPXwOrXdLJyesId70hD6qm+c3Nom6uj5q eTdZsgtCMc5Ax9ZJhko6HjBEDiewK5yXcK2+ks1N6ZNWGM0ldAbrsSiLcKqAePJ8SRzIJgPN 9bAstDIey1K0RmhsDn5wT9OdMhzN6btJ2Mv47lvhFQpcUAUdAZ0++/YTzra3FLeA== X-Talos-CUID: 9a23:qhWS2G+/ELALHQlTbhGVv1wKKp8AcyzP93Hzc3KmJyVsFOSJUlDFrQ== X-Talos-MUID: 9a23:Co9AUAnfKNbw8caCWa18dnpaM91E5PyVUXxXtos3pvi8NiV8BGiC2WE= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="528110623" Received: from rcdn-l-core-06.cisco.com ([173.37.255.143]) by rcdn-iport-8.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-06.cisco.com (Postfix) with ESMTPS id 5AEAD180004B2; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 040CCCBF202; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 2/7] ntfs-3g-ntfsprogs: fix CVE-2026-46571 Date: Fri, 16 Oct 2026 00:46:35 -0700 Message-Id: <20261016074640.3986037-3-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-06.cisco.com 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, 16 Oct 2026 07:46:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131073 From: Darsh Kelaiya This patch applies the upstream fix shown in [1]. The NVD record describing the vulnerability is referenced in [2]. [1] https://github.com/tuxera/ntfs-3g/commit/b912272b30c552b0457e40a0a68b1fac2587aaea [2] https://nvd.nist.gov/vuln/detail/CVE-2026-46571 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-46571.patch | 50 +++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46571.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46571.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46571.patch new file mode 100644 index 0000000000..b2739f026e --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46571.patch @@ -0,0 +1,50 @@ +From fc32321c8c795e9f73cbdd8f36fcd9e0a3a9814b Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Mon, 8 Jun 2026 14:16:39 +0300 +Subject: [PATCH] reparse.c: Bounds-check locase index in ntfs_fix_file_name. + +The case-insensitive branch indexed vol->locase with a raw 16-bit code +point and no check against vol->upcase_len. A truncated $UpCase made +the table shorter than 65536 entries, so a file name character >= +upcase_len read past it and leaked 2 heap bytes via the symlink target +returned to userspace. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-46571 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/b912272b30c552b0457e40a0a68b1fac2587aaea] + +(cherry picked from commit b912272b30c552b0457e40a0a68b1fac2587aaea) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/reparse.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/libntfs-3g/reparse.c b/libntfs-3g/reparse.c +index 76dbe2f1..54858caa 100644 +--- a/libntfs-3g/reparse.c ++++ b/libntfs-3g/reparse.c +@@ -196,11 +196,19 @@ static u64 ntfs_fix_file_name(ntfs_inode *dir_ni, ntfschar *uname, + lemref = entry->indexed_file; + mref = le64_to_cpu(lemref); + if (NVolCaseSensitive(vol) || !vol->locase) { +- for (i=0; ifile_name_length; i++) ++ for (i=0; ifile_name_length; ++ i++) + uname[i] = found->file_name[i]; + } else { +- for (i=0; ifile_name_length; i++) +- uname[i] = vol->locase[le16_to_cpu(found->file_name[i])]; ++ for (i=0; ifile_name_length; ++ i++) { ++ u16 u = le16_to_cpu(found-> ++ file_name[i]); ++ uname[i] = (u < vol->upcase_len) ++ ? vol->locase[u] ++ : found-> ++ file_name[i]; ++ } + } + } + } diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 8995807d95..c6517581b8 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -11,6 +11,7 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-46572_CVE-2026-42617_p1.patch \ file://CVE-2026-46572_CVE-2026-42617_p2.patch \ file://CVE-2026-46572_CVE-2026-42617_p3.patch \ + file://CVE-2026-46571.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101060 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 28C48CCA462 for ; Fri, 16 Oct 2026 07:46:47 +0000 (UTC) Received: from rcdn-iport-5.cisco.com (rcdn-iport-5.cisco.com [173.37.86.76]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16842.1792136805358011307 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=NXlZR28G; spf=pass (domain: cisco.com, ip: 173.37.86.76, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=3358; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V7y8eqeYgeXcvASr2EeG1y+gvS9/0U7aOPAvO2OQBYQ=; b=NXlZR28GhZBy9ULvyYPSUoL7wOw2C0sLVbSD7FKOgwcFq9lUpxWeWOVv V9nIU5bUiJzIPy9voutt4w03QQJqZ7WvMNasCE5eMeSh+d90S8KjAzNrb jRb4G4WPHZuzaI+vLKlR5kAo1nZNso0BflSdjCsJCig8pysu6ynBhAPPn m18jk2bADJ+2IfYWbaeZCgYoqAUOPc9URT4UeG5+iisvt2mS6pYG/533A kFnFl3bCeyKlBuh+HZZkCXpbSa5WTjCbO2/oczkssZDLJkcnNS+xyySTp zzDVfnDwbFujLUhUCzQNngiq7iAsC8Crr8ymig7ac1uUwALpjP+J5KH+l w==; X-CSE-ConnectionGUID: NSvOlFiKTu6+jYyj9qxfiQ== X-CSE-MsgGUID: +pXrsNxzQXWqeOcVZOXbYw== X-IPAS-Result: A0BHAgAY1NFq/47/Ja1aglmCV3VgQ0mWSgOeHIF+DwEBAQ9EDQQBAYUFAo4VAiY0CQ4BAgQDAgMBAQEBAQEBAQEBAQEKAQEFAQEBAgEHBYEOE4ZPDZASAQIBAycLAUYQHAMBAi8rIwgZgwIBgnQDEb0hgXkzgQGDaQJDUNsyAQsUAYE4hUCII10YAYR8JxsbgXKBFYNpgQWBXAEBiAMiBIIigQyBWh6VKUiBHgNZLAFVEw0KCwcFgWgDNRIqFW4yHYEjPheBBxsGBYEdgSCCFiMZNnqBCV6BKylgARAXgQmCBwKCVIIAAgFJQQ4HRVMJJUMSRyYiCBIJARMaMAuBGzg8CShBFwxzDB0FcggCDQkHKRgNSBEsNxUZBD5uB5IUHoJlgQ4BKgEggUyBDqUnoQ8KKIN2jCKVOhozhVulFAuYfY4Klk+EaYFoPIFHCwdwFYMiCUoZD445J4NEgX/MWycyAgkyAQEHAgcOAwuBaJF+AQE IronPort-Data: A9a23:C/5A+6IBjDc4+08VFE+RgZQlxSXFcZb7ZxGr2PjKsXjdYENS3mdSy moaUGyFPPaPYGX8fI1xbojjoUJXsMSHyd42QAYd+CA2RRqmiyZq6fd1j6vUF3nPRiEWZBs/t 63yUvGZcoZpCCea+Uf1WlTYhSEU/bmSQbbhA/LzNCl0RAt1IA8skhsLd9QR2uaEuvDnRVnS0 T/Oi5eHYgH8g2cqajt8B5+r8XuDgtyj4Fv0gXRmDRx7lAe2v2UYCpsZOZawIxPQKqFIHvS3T vr017qw+GXU5X8FUrtJRZ6iLyXm6paLVeS/oiI+t5qK23CulQRuukoPD8fwXG8M49m/c3+d/ /0W3XC4YV9B0qQhA43xWTEAe811FfUuFLMqvRFTvOTLp3AqfUcAzN1IN18ROaMZ2dpqXyJMx O0aeSkdYBG60rfeLLKTEoGAh+w5J8XteYdasXZ6wHSBULAtQIvIROPB4towMDUY358VW62BI ZBENHw2ME6ojx5nYj/7DLoyn+qsj3juehVTqUmeouw85G27IAlZjeOzbYCJI4PbLSlTtgWAl njd2XTrOyElLdG4wgS31UKmt/CayEsXX6pXTtVU7MVCh0WewGEWAhAaWVa35PW0lEO6c9ZeM FAPvC02oK4/8UamQtXwU1u/unHsg/IHc8BbH+t/7ESGzbDZpl7EQGMFVTVGLtchsafaWAAX6 7NApPuxbRQHjVFfYSj1Gmu8xd9qBRUoEA== IronPort-HdrOrdr: A9a23:LEWrea6FpmBP/+xdTwPXwOrXdLJyesId70hD6qm+c3Nom6uj5q eTdZsgtCMc5Ax9ZJhko6HjBEDiewK5yXcK2+ks1N6ZNWGM0ldAbrsSiLcKqAePJ8SRzIJgPN 9bAstDIey1K0RmhsDn5wT9OdMhzN6btJ2Mv47lvhFQpcUAUdAZ0++/YTzra3FLeA== X-Talos-CUID: 9a23:w+urs2qAnQRiRnG6r2cbqfPmUeYebFrZ4nbzH1LmSmRYWb/EUE+e+Zoxxg== X-Talos-MUID: 9a23:ll4b3wmnDukYwtuutfA/dnohLPdy+IK+Gnk9rowLnMK6BwtAMQaC2WE= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="536524179" Received: from rcdn-l-core-05.cisco.com ([173.37.255.142]) by rcdn-iport-5.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-05.cisco.com (Postfix) with ESMTPS id 60D9418000354; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 0CDF6CBF203; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 3/7] ntfs-3g-ntfsprogs: fix CVE-2026-46570 Date: Fri, 16 Oct 2026 00:46:36 -0700 Message-Id: <20261016074640.3986037-4-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-05.cisco.com 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, 16 Oct 2026 07:46:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131071 From: Darsh Kelaiya This patch applies the upstream fix shown in [1]. The NVD record describing the vulnerability is referenced in [2]. [1] https://github.com/tuxera/ntfs-3g/commit/5ab37421ebbcbf33bf96876c7a034393bda05a25 [2] https://nvd.nist.gov/vuln/detail/CVE-2026-46570 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-46570.patch | 42 +++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46570.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46570.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46570.patch new file mode 100644 index 0000000000..fb76bc80b1 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46570.patch @@ -0,0 +1,42 @@ +From bb4da656cab16325002eaf785ca967d426510e94 Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Mon, 8 Jun 2026 14:24:54 +0300 +Subject: [PATCH] Cap B tree depth in ntfs_index_walk_down to MAX_PARENT_VCN. + +ntfs_index_walk_down() incremented ictx->pindex and wrote into +ictx->parent_pos[] / parent_vcn[] (both sized MAX_PARENT_VCN) without +checking the bound. A B+tree deeper than MAX_PARENT_VCN levels then +overflowed both arrays and since parent_vcn[32] overlaps the pindex +field the OOB write gave an attacker control over the next iteration's +offset and value. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-46570 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/5ab37421ebbcbf33bf96876c7a034393bda05a25] + +(cherry picked from commit 5ab37421ebbcbf33bf96876c7a034393bda05a25) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/index.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libntfs-3g/index.c b/libntfs-3g/index.c +index c9651a62..9c11a45c 100644 +--- a/libntfs-3g/index.c ++++ b/libntfs-3g/index.c +@@ -2105,6 +2105,13 @@ static INDEX_ENTRY *ntfs_index_walk_down(INDEX_ENTRY *ie, + /* down from non-zero level */ + + ictx->pindex++; ++ if (ictx->pindex >= MAX_PARENT_VCN) { ++ errno = EOPNOTSUPP; ++ ntfs_log_perror("Index is over %d level deep", ++ MAX_PARENT_VCN); ++ entry = (INDEX_ENTRY*)NULL; ++ break; ++ } + } + ictx->parent_pos[ictx->pindex] = 0; + ictx->parent_vcn[ictx->pindex] = vcn; diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index c6517581b8..97663fd109 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -12,6 +12,7 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-46572_CVE-2026-42617_p2.patch \ file://CVE-2026-46572_CVE-2026-42617_p3.patch \ file://CVE-2026-46571.patch \ + file://CVE-2026-46570.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101066 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 9B2B5CCF2C1 for ; Fri, 16 Oct 2026 07:46:48 +0000 (UTC) Received: from rcdn-iport-1.cisco.com (rcdn-iport-1.cisco.com [173.37.86.72]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16844.1792136805451082436 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=SxWcSxgF; spf=pass (domain: cisco.com, ip: 173.37.86.72, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=4205; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fk0EqlEdj1BG00hr2XipyPuE1LMIQX12VRYxGecDcZQ=; b=SxWcSxgFMrga/wqrOBGNTUcLrGHx1a90zICoQy4J7GfvxM4VaH3NcMQQ 3wIVE8FEB8Vvx/Dcf4fwELYCBaIQnelcaVrbXI7RlEcDA8cGauqC+odH4 TS4SUak1z1rOqUD+dWvtwaqj1jIufc6oseplA4bv+ZLfzJwQxmbU7VWYk i0MUH18pUE4OQQchIRZ4HdTOiV9MEp19gtbKOXV+wY0U6OUk2Od9KTf5y EidhRNq96VlTZZT/eVjNKSZsEWG4u3584/DOWXe4irrRaffSNyJazvuv+ KSUzh65yrtLYQKHR0ATRmsL9NUIxLrOLSw5WYUF70UPje8uljF+az9v/K A==; X-CSE-ConnectionGUID: B1iXqJvTTJ2QGw3OSj0TSg== X-CSE-MsgGUID: I/474wz2RLaLP0gcHnZTNQ== X-IPAS-Result: A0BHAgAY1NFq/5L/Ja1aglmCV3VgQ0mWSgOeHIF+DwEBAQ9EDQQBAYUFAo4VAiY0CQ4BAgQDAgMBAQEBAQEBAQEBAQEKAQEFAQEBAgEHBYEOE4ZPDZASAQIBAycLAUYQHAMBAi8rIwgZgwIBgnQDEb0hgXkzgQGDaQJDUNsyAQsUAYE4hUCII10YAYR8JxsbgXKBFYNpgQWBXAEBgSeGXCIEgiKBDIFaHpUpSIEeA1ksAVUTDQoLBwWBaAM1EioVbjIdgSM+F4EHGwYFgR2BIIIWIxk2eoEJXoErKWABEBeBCYIHAoJUggACAUlBDgdFUwklQxJHJiIIEgkBExowC4EbODwJKEEXDHMMHQVyCAINCQcpGA1IESw3FRkEPm4HkhQegkUgAYENARMXARcJgUwYph2hDwoog3aMIpU6GjOFW6UUC5h9jgqWT4RpgWg8gUcLB3AVgyIJShkPjjkng0SBf8xbJzICCTIBAQcCBw4DC4FokACBfgEB IronPort-Data: A9a23:R6qew6x9nAyaN/RygYt6t+dnxyrEfRIJ4+MujC+fZmUNrF6WrkUBm 2IdUW3UM/rYMDChfIxzbt7n80tSsZLUyd8wHQA4+1hgHilAwSbn6Xt1DatR0we6dJCroJdPt p1GAjX4BJlqCCKa/lHyYuCJQUBUjcmgXqD7BPPPJhd/TAplTDZJoR94kobVuKYw6TSCK13L4 4yaT/H3Ygf/hWcsazxMsspvlTs21BjMkGJA1rABTagjUG/2zxE9EJ8ZLKetGHr0KqE8NvK6X evK0Iai9Wrf+Ro3Yvv9+losWhRXKlJ6FVHmZkt+A8BOsDAbzsAB+vpT2M4nVKtio27hc+adZ zl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CCe5xWuTpfi/xlhJGtvPL0B2PhLPUMUz NMHcxc2bEi/vO3jldpXSsE07igiBNPgMIVavjRryivUSK53B5vCWK7No9Rf2V/chOgXQq2YP JVfM2cyKk2cPXWjOX9PYH46tOuri332cixRgFmUvqEwpWPUyWSd1ZCwa4SNJYLWFZU9ckCwh yWaoDjmEEsgENW78WKK+VKqtNPppHauMG4VPPjinhJwu3WU3mEVBRgcWFe3rPX8hkOgVtZ3L 00P5jFoqrA/8kGuRNTxUxC05nmesXYht8F4CeY27kSJj6HT+QvcXjlCRT9aY9tgv8gzLdA36 mK0cxrSLWQHmNWopbi1r994cRva1fApEFI/ IronPort-HdrOrdr: A9a23:rPzbuqpMQq0MxZDXyyVZgFcaV5oJeYIsimQD101hICG9vPb2qy nIpoV96faaslcssR0b9OxofZPwI080lqQFhbX5Q43DYOCOggLBR+tfBMnZsljd8kbFmNK1u5 0NT0EHMqySMXFKyeDn/QK/D9EshPOD8KyumKPi6k0Fd3ANV0mlhD0Jcjpy1SZNNXB7OaY= X-Talos-CUID: 9a23:pljosG5/wODTlMz19dss3hcVKtkHbEHh7i3pDFDjLl1rEIGuRgrF X-Talos-MUID: 9a23:132/3g5ueYvKpz+xe7cqt86YxoxJpPjxVF8fy68isu28bSN7GzGvsBKOF9o= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="536076488" Received: from rcdn-l-core-09.cisco.com ([173.37.255.146]) by rcdn-iport-1.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-09.cisco.com (Postfix) with ESMTPS id 6580218000238; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 0F56CCBF204; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 4/7] ntfs-3g-ntfsprogs: fix CVE-2026-46569 Date: Fri, 16 Oct 2026 00:46:37 -0700 Message-Id: <20261016074640.3986037-5-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-09.cisco.com 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, 16 Oct 2026 07:46:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131074 From: Darsh Kelaiya This patch applies the upstream fix shown in [1]. The NVD record describing the vulnerability is referenced in [2]. [1] https://github.com/tuxera/ntfs-3g/commit/961ed5c2fa2f36ef6a347f04e1fa586113c97e7c [2] https://nvd.nist.gov/vuln/detail/CVE-2026-46569 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-46569.patch | 62 +++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46569.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46569.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46569.patch new file mode 100644 index 0000000000..5c496159ec --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-46569.patch @@ -0,0 +1,62 @@ +From 677d21be1ac7ec0a59cfbed8e26d1ffbf0922ac1 Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Mon, 8 Jun 2026 10:34:38 +0300 +Subject: [PATCH] Bound tail_size in ntfs_ib_copy_tail against destination + capacity. + +A crafted source INDX block can drive tail_size past the freshly +allocated destination's usable space and overflow the memcpy. Add +a capacity check (and a < 0 guard against sign-extension at +memcpy). + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting +this issue. + +CVE: CVE-2026-46569 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/961ed5c2fa2f36ef6a347f04e1fa586113c97e7c] + +(cherry picked from commit 961ed5c2fa2f36ef6a347f04e1fa586113c97e7c) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/index.c | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libntfs-3g/index.c b/libntfs-3g/index.c +index 9c11a45c..347bd408 100644 +--- a/libntfs-3g/index.c ++++ b/libntfs-3g/index.c +@@ -1193,7 +1193,7 @@ static int ntfs_ib_copy_tail(ntfs_index_context *icx, INDEX_BLOCK *src, + { + u8 *ies_end; + INDEX_ENTRY *ie_head; /* first entry after the median */ +- int tail_size, ret; ++ int tail_size, dst_capacity, ret; + INDEX_BLOCK *dst; + + ntfs_log_trace("Entering\n"); +@@ -1207,6 +1207,25 @@ static int ntfs_ib_copy_tail(ntfs_index_context *icx, INDEX_BLOCK *src, + + ies_end = (u8 *)ntfs_ie_get_end(&src->index); + tail_size = ies_end - (u8 *)ie_head; ++ dst_capacity = (int)(le32_to_cpu(dst->index.allocated_size) ++ - le32_to_cpu(dst->index.entries_offset)); ++ ++ /* ++ * src->index.entries_offset (on-disk, only required to be >= ++ * sizeof(INDEX_HEADER) by ntfs_index_block_inconsistent) may be smaller ++ * than dst's, which ntfs_ib_alloc fixes (40 on a 4 KiB block). When ++ * the median lands near the start of the source stream the gap lets ++ * tail_size exceed dst's usable space. The < 0 guard catches a ++ * negative tail_size before memcpy sign-extends it into a huge size_t. ++ */ ++ if (tail_size < 0 || tail_size > dst_capacity) { ++ ntfs_log_error("Invalid tail_size %d (dst capacity %d) in " ++ "ntfs_ib_copy_tail\n", tail_size, dst_capacity); ++ free(dst); ++ errno = EIO; ++ return STATUS_ERROR; ++ } ++ + memcpy(ntfs_ie_get_first(&dst->index), ie_head, tail_size); + + dst->index.index_length = cpu_to_le32(tail_size + diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 97663fd109..4d5f88f611 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -13,6 +13,7 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-46572_CVE-2026-42617_p3.patch \ file://CVE-2026-46571.patch \ file://CVE-2026-46570.patch \ + file://CVE-2026-46569.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101064 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 27B52CCA464 for ; Fri, 16 Oct 2026 07:46:47 +0000 (UTC) Received: from rcdn-iport-4.cisco.com (rcdn-iport-4.cisco.com [173.37.86.75]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16841.1792136805305582302 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=I471UGZQ; spf=pass (domain: cisco.com, ip: 173.37.86.75, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=13187; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Jq8ONwv7uj0Hi5ZvFBa71QdKcSV+YilrOZr2MxLpe0k=; b=I471UGZQDp/Wpu66ITY+xkpScDlXXQuje3Yo3pVtgDCpvavKRe6xd9iL OqpFMuQa8ssbwZZGvehDK23wUKPK5bbUwvGhhRW37X5FseUMGSBbZf9C7 lylp5jMuylv46pNZO8//kBSGwWoIilPhd0m6In7lVVllRSE8rY4aU3sAq MI6NXrj8jLvDVRz+54FS8JNMkCHRHI3Z2jaYvX9IcTgeePF9Q6G0QVMP0 m5xT7DoJfntsvJzSCsU0O0OsL36GLiX4OEN+iw51qa9KMmjNRvnvDrjZY IC+Tnh8ie3hILMKK+KN0SxGvppwBCF0Juu+82o3tXRkWV6iy0MC5tlHV1 A==; X-CSE-ConnectionGUID: VOlv7B1XR0uVA5V8Yysr3g== X-CSE-MsgGUID: 2mkndhw6QUS66ka8IhhzmA== X-IPAS-Result: A0BHAgAY1NFq/5X/Ja1aHgEBCxIMggULgld1YENJlkoDgROQN4xSgX4PAQEBD0QNBAEBhQUCjhUCJjQJDgECBAMCAwEBAQEBAQEBAQEBAQoBAQUBAQECAQcFgQ4Thk8NkBIBAgEDMgFGEBwDAQIvKyMIGYMCAYJ0AxG9IYIsgQGDaQJDUNsyAQsUAYE4hUCII10YAYR8JxsbgXKBFYJzdoEFgVwBAYEYhmsiBIIigQyBWh6VKUiBHgNZLAFVEw0KCwcFgWgDNRIqFW4yHYEjPheBBxsGBYEdgSCCFiMZNnqBCV6BKylgARAXgQmCBwKCVIIAAgFJQQ4HRVMJJUMSRyYiCBIJARMaMAuBGzg8CShBFwxzDB0FcggCDQkHKRgNSBEsNxUZBD5uB5IUHoJFIAEVFwQMPhMBKgEXCWUTNRcIYpMMEZI2gTWeHIE+CiiDdowilToaM4QEgVeSQJJUC5h9glmLMZVmARkCED2EaYFoPIEoHAMLB3AVgyIJShkPjisOCxyDRIF/zFsnMgIJMgEBBwIHDgMLgWiQAg8XB4FPAQE IronPort-Data: A9a23:BcXHB6nKJihGaZxGrIJkLIHo5gzRJ0RdPkR7XQ2eYbSJt1+Wr1Gzt xJLUD+BbvvfYmOmLtpyPNm+8xsCu8OAnYJhTQo6qH1jQVtH+JHPbTi7wugcHM8zwunrFh8PA xA2M4GYRCwMZiaC4Errav6+/SEUOZigHtLUEPTDNj16WThqQSIgjQMLs+Mii+aEu/Dha++2k Y20+ZK31GONgWYubDtMsvzb8XuDgdyr0N8mlg1mDRx0lAe2e0k9VPo3Oay3Jn3kdYhYdsbSb /rD1ryw4lTC9B4rDN6/+p6jGqHdauePVeQmoiM+t5mK2nCulARrukoIHKZ0hXNsttm8t4sZJ OOhGnCHYVxB0qXkwIzxWvTDes10FfUuFLTveRBTvSEPpqHLWyOE/hlgMK05FbM//vgoKzh+z 6QFFhlQUECylvmsm73uH4GAhux7RCXqFJkUtnclyXTSCuwrBMmZBa7L/tRfmjw3g6iiH96HO JFfMmUpNkmdJUQTaz/7C7pm9AusrnX8fjlRqUOcjaE2+GPUigd21dABNfKIIYLQGpQKxB/wS mTupWH6BB0aK4Km9AHbrHGl1s7PnTH+cddHfFG/3rsw6LGJ/UQUEBAQWF6xrPW1h0L7V99BJ kg8/is1sbN081SmSNT4VRC0rHOI+BkGVLJt//YS8gqBzO/Qpg2eHGVBF2QHY909v8hwTjsvv rOUo+7U6fVUmOX9YRqgGn289Fte5QB9wbc+WBI5 IronPort-HdrOrdr: A9a23:IT+xYK2G73Er9F3lUncjvwqjBJAkLtp133Aq2lEZdPWaSKOlfq eV7ZMmPHDP6Qr5NEtMpTnEAtjjfZq+z+8Q3WBuB9eftWDd0QPCRr2Kr7GSpgEIcBeRygcy78 tdmtBFeb7NJGk/q9rm6w+lFNtl6tyG/Ke0wdr69R5WPGdXg2UK1XYANu5deXcGPTV7OQ== X-Talos-CUID: 9a23:2aOeemO4fpkR1+5DZg5j6hE+Q/AfKmDj5Sruc36pEnwyR+jA X-Talos-MUID: 9a23:v2mMsg/49Ze9CYVILKC7OEGQf51t4KKiCF9TqKg95ZeHPHxROzePiR3iFw== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="536279721" Received: from rcdn-l-core-12.cisco.com ([173.37.255.149]) by rcdn-iport-4.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-12.cisco.com (Postfix) with ESMTPS id B5D62180001E6; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 1316ACBF21E; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 5/7] ntfs-3g-ntfsprogs: fix CVE-2026-42618 Date: Fri, 16 Oct 2026 00:46:38 -0700 Message-Id: <20261016074640.3986037-6-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-12.cisco.com 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, 16 Oct 2026 07:46:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131076 From: Darsh Kelaiya This patch applies the upstream fixes shown in [1] and [2]. The NVD record describing the vulnerability is referenced in [3]. [1] https://github.com/tuxera/ntfs-3g/commit/e021cbe3d7a42963110e4561f2a1327614c20a00 [2] https://github.com/tuxera/ntfs-3g/commit/6aa66d98980ac1d966d7977c7b079f4fe380eb42 [3] https://nvd.nist.gov/vuln/detail/CVE-2026-42618 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-42618_p1.patch | 53 +++++ .../files/CVE-2026-42618_p2.patch | 216 ++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 2 + 3 files changed, 271 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p1.patch create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p2.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p1.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p1.patch new file mode 100644 index 0000000000..15aad65234 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p1.patch @@ -0,0 +1,53 @@ +From fbc829df733e7aa960780e0c60d26a0b63786a38 Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Fri, 24 Apr 2026 12:06:24 +0300 +Subject: [PATCH] compress.c: Fix incorrect comparison in destination bounds + check. + +When checking whether 'dest' was at or past the end of the destination +buffer we were checking if 'dest' was larger then 'dest_sb_end', however +'dest_sb_end' is already past the end of the destination buffer since +it is constructed with 'dest + dest_size', i.e. dereferencing +'dest_sb_end' is invalid. Fixed by using '>=' instead of '>'. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-42618 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/e021cbe3d7a42963110e4561f2a1327614c20a00] + +Backport Changes: +- Upstream e021cbe3 follows the indentation changes in 6c67a098. + Apply its two bounds checks to the original ntfs_decompress() layout + in libntfs-3g/compress.c from NTFS-3G 2022.10.3. +- Preserve both upstream dest >= dest_sb_end checks so the tag and + token paths stop before accessing the end of the destination buffer. + +(cherry picked from commit e021cbe3d7a42963110e4561f2a1327614c20a00) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/compress.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libntfs-3g/compress.c b/libntfs-3g/compress.c +index 390b2d97..5f4df0ea 100644 +--- a/libntfs-3g/compress.c ++++ b/libntfs-3g/compress.c +@@ -546,7 +546,7 @@ do_next_tag: + goto do_next_sb; + } + /* Check we are still in range. */ +- if (cb > cb_sb_end || dest > dest_sb_end) ++ if (cb > cb_sb_end || dest >= dest_sb_end) + goto return_overflow; + /* Get the next tag and advance to first token. */ + tag = *cb++; +@@ -557,7 +557,7 @@ do_next_tag: + u8 *dest_back_addr; + + /* Check if we are done / still in range. */ +- if (cb >= cb_sb_end || dest > dest_sb_end) ++ if (cb >= cb_sb_end || dest >= dest_sb_end) + break; + /* Determine token type and parse appropriately.*/ + if ((tag & NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) { diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p2.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p2.patch new file mode 100644 index 0000000000..4cb459d766 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42618_p2.patch @@ -0,0 +1,216 @@ +From 8221131a1dea1a06e7a8134a04b0a68975f58829 Mon Sep 17 00:00:00 2001 +From: Rakesh Pandit +Date: Thu, 30 Apr 2026 19:33:52 +0300 +Subject: [PATCH] compress.c: Harden LZNT1 sub-block decompression bounds + checks. + +ntfs_decompress() could continue decoding tokens after the current +4 KiB destination sub-block was already full. If the next token was a +symbol token, the decoder wrote one byte at dest_sb_end, outside the +valid destination range. + +Finish the current compressed sub-block when either its compressed input +is exhausted or its output sub-block is full. If the output fills +first, skip the remaining bytes in that compressed sub-block so they are +not interpreted as more tags or tokens. + +While here, read the sub-block header only after verifying that two +input bytes remain, reuse the decoded header value, and reject truncated +phrase tokens before reading their two-byte compressed word. + +Also fix the function comment to match the userspace return convention: +return 0 on success, or return -1 with errno set to EOVERFLOW on +malformed compressed input. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-42618 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/6aa66d98980ac1d966d7977c7b079f4fe380eb42] + +Backport Changes: +- Upstream 6aa66d98 follows the loop indentation changes in 6c67a098. + Apply its ntfs_decompress() changes in libntfs-3g/compress.c to + the original NTFS-3G 2022.10.3 layout, omitting those extra scopes. +- Keep the two-byte header and phrase-token checks, stop decoding + when the output sub-block is full, and skip its remaining input. + Retain upstream finish_compressed_sb and complete labels unchanged. + +(cherry picked from commit 6aa66d98980ac1d966d7977c7b079f4fe380eb42) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/compress.c | 101 ++++++++++++++++++++++++++++-------------- + 1 file changed, 68 insertions(+), 33 deletions(-) + +diff --git a/libntfs-3g/compress.c b/libntfs-3g/compress.c +index 5f4df0ea..e32c2288 100644 +--- a/libntfs-3g/compress.c ++++ b/libntfs-3g/compress.c +@@ -459,7 +459,8 @@ static unsigned int ntfs_compress_block(const char *inbuf, const int bufsize, + * @cb_start is a pointer to the compression block which needs decompressing + * and @cb_size is the size of @cb_start in bytes (8-64kiB). + * +- * Return 0 if success or -EOVERFLOW on error in the compressed stream. ++ * Return 0 on success. On error in the compressed stream, set errno to ++ * EOVERFLOW and return -1. + */ + static int ntfs_decompress(u8 *dest, const u32 dest_size, + u8 *const cb_start, const u32 cb_size) +@@ -479,23 +480,29 @@ static int ntfs_decompress(u8 *dest, const u32 dest_size, + /* Variables for tag and token parsing. */ + u8 tag; /* Current tag. */ + int token; /* Loop counter for the eight tokens in tag. */ ++ u16 hdr; /* Current sub-block header. */ + + ntfs_log_trace("Entering, cb_size = 0x%x.\n", (unsigned)cb_size); + do_next_sb: + ntfs_log_debug("Beginning sub-block at offset = %d in the cb.\n", + (int)(cb - cb_start)); + /* +- * Have we reached the end of the compression block or the end of the +- * decompressed data? The latter can happen for example if the current +- * position in the compression block is one byte before its end so the +- * first two checks do not detect it. ++ * Have we reached the end of the compression block or the end ++ * of the decompressed data? ++ * ++ * Check dest == dest_end before reading the next two-byte sub- ++ * block header. The compressed pointer can legally be near the ++ * end of the buffer when the requested output has already been ++ * produced. + */ +- if (cb == cb_end || !le16_to_cpup((le16*)cb) || dest == dest_end) { +- if (dest_end > dest) +- memset(dest, 0, dest_end - dest); +- ntfs_log_debug("Completed. Returning success (0).\n"); +- return 0; +- } ++ if (cb == cb_end || dest == dest_end) ++ goto complete; ++ /* A sub-block header is two bytes. */ ++ if ((size_t)(cb_end - cb) < 2) ++ goto return_overflow; ++ hdr = le16_to_cpup((le16*)cb); ++ if (!hdr) ++ goto complete; + /* Setup offset for the current sub-block destination. */ + dest_sb_start = dest; + dest_sb_end = dest + NTFS_SB_SIZE; +@@ -503,16 +510,15 @@ do_next_sb: + if (dest_sb_end > dest_end) + goto return_overflow; + /* Does the minimum size of a compressed sb overflow valid range? */ +- if (cb + 6 > cb_end) ++ if ((size_t)(cb_end - cb) < 6) + goto return_overflow; + /* Setup the current sub-block source pointers and validate range. */ + cb_sb_start = cb; +- cb_sb_end = cb_sb_start + (le16_to_cpup((le16*)cb) & NTFS_SB_SIZE_MASK) +- + 3; ++ cb_sb_end = cb_sb_start + (hdr & NTFS_SB_SIZE_MASK) + 3; + if (cb_sb_end > cb_end) + goto return_overflow; + /* Now, we are ready to process the current sub-block (sb). */ +- if (!(le16_to_cpup((le16*)cb) & NTFS_SB_IS_COMPRESSED)) { ++ if (!(hdr & NTFS_SB_IS_COMPRESSED)) { + ntfs_log_debug("Found uncompressed sub-block.\n"); + /* This sb is not compressed, just copy it into destination. */ + /* Advance source position to first data byte. */ +@@ -532,22 +538,18 @@ do_next_sb: + /* Forward to the first tag in the sub-block. */ + cb += 2; + do_next_tag: +- if (cb == cb_sb_end) { +- /* Check if the decompressed sub-block was not full-length. */ +- if (dest < dest_sb_end) { +- int nr_bytes = dest_sb_end - dest; +- +- ntfs_log_debug("Filling incomplete sub-block with zeroes.\n"); +- /* Zero remainder and update destination position. */ +- memset(dest, 0, nr_bytes); +- dest += nr_bytes; +- } +- /* We have finished the current sub-block. */ +- goto do_next_sb; +- } + /* Check we are still in range. */ +- if (cb > cb_sb_end || dest >= dest_sb_end) ++ if (cb > cb_sb_end || dest > dest_sb_end) + goto return_overflow; ++ /* ++ * Finish this compressed sub-block when either its ++ * compressed input is exhausted or its 4 KiB output ++ * slot is full. If output becomes full first, skip the ++ * remaining compressed bytes in this sub-block instead ++ * of interpreting them as more tags/tokens. ++ */ ++ if (cb == cb_sb_end || dest == dest_sb_end) ++ goto finish_compressed_sb; + /* Get the next tag and advance to first token. */ + tag = *cb++; + /* Parse the eight tokens described by the tag. */ +@@ -557,8 +559,10 @@ do_next_tag: + u8 *dest_back_addr; + + /* Check if we are done / still in range. */ +- if (cb >= cb_sb_end || dest >= dest_sb_end) +- break; ++ if (cb > cb_sb_end || dest > dest_sb_end) ++ goto return_overflow; ++ if (cb == cb_sb_end || dest == dest_sb_end) ++ goto finish_compressed_sb; + /* Determine token type and parse appropriately.*/ + if ((tag & NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) { + /* +@@ -570,11 +574,21 @@ do_next_tag: + continue; + } + /* +- * We have a phrase token. Make sure it is not the first tag in +- * the sb as this is illegal and would confuse the code below. ++ * We have a phrase token. Make sure it is not ++ * the first token in the sb as this is illegal ++ * and would confuse the code below. + */ + if (dest == dest_sb_start) + goto return_overflow; ++ /* ++ * A phrase token is a two-byte compressed word. ++ * The generic token check above only proves ++ * that at least one byte remains, which is ++ * enough for a symbol token but not for a ++ * phrase token. ++ */ ++ if ((size_t)(cb_sb_end - cb) < 2) ++ goto return_overflow; + /* + * Determine the number of bytes to go back (p) and the number + * of bytes to copy (l). We use an optimized algorithm in which +@@ -626,6 +640,27 @@ do_next_tag: + } + /* No tokens left in the current tag. Continue with the next tag. */ + goto do_next_tag; ++finish_compressed_sb: ++ /* Check if the decompressed sub-block was not full-length. */ ++ if (dest < dest_sb_end) { ++ size_t nr_bytes = dest_sb_end - dest; ++ ++ ntfs_log_debug("Filling incomplete sub-block with zeroes.\n"); ++ /* Zero remainder and update destination position. */ ++ memset(dest, 0, nr_bytes); ++ dest += nr_bytes; ++ } ++ /* ++ * If the output sub-block filled before the compressed sub-block input ++ * was exhausted, skip the remaining compressed bytes in this sub-block. ++ */ ++ cb = cb_sb_end; ++ goto do_next_sb; ++complete: ++ if (dest_end > dest) ++ memset(dest, 0, dest_end - dest); ++ ntfs_log_debug("Completed. Returning success (0).\n"); ++ return 0; + return_overflow: + errno = EOVERFLOW; + ntfs_log_perror("Failed to decompress file"); diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 4d5f88f611..6489ac3d27 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -14,6 +14,8 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-46571.patch \ file://CVE-2026-46570.patch \ file://CVE-2026-46569.patch \ + file://CVE-2026-42618_p1.patch \ + file://CVE-2026-42618_p2.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101062 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 49818CCA46D for ; Fri, 16 Oct 2026 07:46:47 +0000 (UTC) Received: from rcdn-iport-3.cisco.com (rcdn-iport-3.cisco.com [173.37.86.74]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16845.1792136805786198513 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=EKgmzP+f; spf=pass (domain: cisco.com, ip: 173.37.86.74, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=3879; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LMjd39s0QZKmAdU7gsOXcgN9bW0doA2aRStGVgb82ig=; b=EKgmzP+f/uJz2Ufytq6m836++Bm174IN2lIvl6N2L8oi/7GVg8ucrXxx QhTY32LUX+u02e0EB6SnLdyx4SQnsuNmu8bvlAhHKJW3bbd+6LK5dzate JQmlBSB759nFHirjs9k1MyCj3uGVBDUL1mEdgRHkkqdr6atKEzAnd9/m9 QhoJASAouFVKqgIi9vkkJ4ZbNLzMSRdd0XLJGUexV0cWyYPtKN1O8JJW2 AbmaSUKxeE4Z5BdY/PEHKhLn76ux6tl3ilAI4LGir87U92K/ic9eLoB2h mbI16FSjOPV/dbRlz5UJ3MS2BxEqkIJhoXe1q8OXIW9pYMMia87OZaQMO Q==; X-CSE-ConnectionGUID: JKVZZfAyQiWz/o5QQFGL3Q== X-CSE-MsgGUID: emwHT3XuRQy7IcTTAtpnjQ== X-IPAS-Result: A0BGAgAh1tFq/5L/Ja1aglmCV3VgQ0mWSgOeHIF+DwEBAQ9EDQQBAYUFAo4VAiY0CQ4BAgQDAgMBAQEBAQEBAQEBAQEKAQEFAQEBAgEHBYEOE4ZPDZASAQIBAzIBRhAcAwECLysjCBmDAgGCdAMRvSCCLIEBg2kCQ1DbMgELFAGBOIVAiCNdGAGEfCcbG4FyhH6BBYFcAQGIAyIEgiKBDIFaHpUpSIEeA1ksAVUTDQoLBwWBaAM1EioVbjIdgSM+F4EHGwYFgR2BIIIWIxk2eoEJXoErKWABEBeBCYIHAoJUggACAUlBDgdFUwklQxJHJiIIEgkBExowC4EbODwJKEEXDHMMHQVyCAINCQcpGA1IESw3FRkEPm4HkhQegkUZB4EOARMXASCBNRcBpBOCIaEPCiiDdowilToaM4QEgVeSQJJUC5h9jgqWT4RpgWg8gUcLB3AVgyIJShkPjjkng0SBf8xbJzICCTIBAQcCBw4DC4FokX4BAQ IronPort-Data: A9a23:mdTuH6J8f9Hm+H3pFE+RgZQlxSXFcZb7ZxGr2PjKsXjdYENSgTEGx mcZXW2HO/uOZ2bxfYpwbdyw/EMG78PWx9dqSQQd+CA2RRqmiyZq6fd1j6vUF3nPRiEWZBs/t 63yUvGZcoZpCCea+Uf1WlTYhSEU/bmSQbbhA/LzNCl0RAt1IA8skhsLd9QR2uaEuvDnRVnS0 T/Oi5eHYgH8g2cqajt8B5+r8XuDgtyj4Fv0gXRmDRx7lAe2v2UYCpsZOZawIxPQKqFIHvS3T vr017qw+GXU5X8FUrtJRZ6iLyXm6paLVeS/oiI+t5qK23CulQRuukoPD8fwXG8M49m/c3+d/ /0W3XC4YV9B0qQhA43xWTEAe811FfUuFLMqvRFTvOTLp3AqfUcAzN1ML38ED4Mx6992PnMJ8 qEhER4iSku60rfeLLKTEoGAh+w5J8XteYdasXZ6wHSBXLAtQIvIROPB4towMDUY358VW62BI ZBENHw2MEqojx5nYj/7DLoyn+qsj3juehVTqUmeouw85G27IAlZjeOzb4SNJYTULSlTtkudu UL6pFTkOCgLa/2U9Qas7mqqhNaayEsXX6pXTtVU7MVCh0WewGEWAhAaWVa35PW0lEO6c9ZeM FAPvC02oK4/8UamQtXwU1u/unHsg/IHc8BbH+t/7ESGzbDZpl7IQGMFVTVGLtchsafaWAAX6 7NApPuxbRQHjVFfYSv1Gmu8xd9qBRUoEA== IronPort-HdrOrdr: A9a23:yi0D5K0gykgw8pxSmXhuVgqjBJAkLtp133Aq2lEZdPWaSKOlfq eV7ZMmPHDP6Qr5NEtMpTnEAtjjfZq+z+8Q3WBuB9eftWDd0QPCRr2Kr7GSpgEIcBeRygcy78 tdmtBFeb7NJGk/q9rm6w+lFNtl6tyG/Ke0wdr69R5WPGdXg2UK1XYANu5deXcGPTV7OQ== X-Talos-CUID: 9a23:rs7W1GPRE249Bu5DegpZxnwaM9Ecc0LPi3CNGnaWJkIycejA X-Talos-MUID: 9a23:3W3yKAtfNPqFOqTJ/82niTR9FPsz07mUMVFSsJ46h+CYLSpyAmLI X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="536760706" Received: from rcdn-l-core-09.cisco.com ([173.37.255.146]) by rcdn-iport-3.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-09.cisco.com (Postfix) with ESMTPS id B6E9018000238; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 16A6FCBEF8A; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 6/7] ntfs-3g-ntfsprogs: fix CVE-2026-42616 Date: Fri, 16 Oct 2026 00:46:39 -0700 Message-Id: <20261016074640.3986037-7-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-09.cisco.com 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, 16 Oct 2026 07:46:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131077 From: Darsh Kelaiya This patch applies the upstream fix shown in [1]. The NVD record describing the vulnerability is referenced in [2]. [1] https://github.com/tuxera/ntfs-3g/commit/dc1b682e99b6c055b0281ca543a8420b698420d1 [2] https://nvd.nist.gov/vuln/detail/CVE-2026-42616 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-42616.patch | 70 +++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42616.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42616.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42616.patch new file mode 100644 index 0000000000..26858a3537 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-42616.patch @@ -0,0 +1,70 @@ +From 96f3c15677c6aa0251798eef74a5a4c376523ee3 Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Fri, 24 Apr 2026 12:18:24 +0300 +Subject: [PATCH] ntfscat.c: Fix reading outside the buffer when block size > + buffer size. + +The block size may be read from the index root's 'index_block_size' +member, and isn't guaranteed to be >= 4096 (as far as I can tell it +could be larger). This would for MST protected records lead to storing +data past the end of the allocated buffer. + +Fixed by allocating the necessary amount of buffer space for the case +when the block size exceeds 4096. + +Thanks to Alexandro Calo' from Nozomi Networks Labs for reporting this +issue. + +CVE: CVE-2026-42616 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/dc1b682e99b6c055b0281ca543a8420b698420d1] + +(cherry picked from commit dc1b682e99b6c055b0281ca543a8420b698420d1) +Signed-off-by: Darsh Kelaiya +--- + ntfsprogs/ntfscat.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c +index b8af2503..0f711815 100644 +--- a/ntfsprogs/ntfscat.c ++++ b/ntfsprogs/ntfscat.c +@@ -334,22 +334,17 @@ static int index_get_size(ntfs_inode *inode) + static int cat(ntfs_volume *vol, ntfs_inode *inode, ATTR_TYPES type, + ntfschar *name, int namelen) + { +- const int bufsize = 4096; + char *buffer; + ntfs_attr *attr; + s64 bytes_read, written; + s64 offset; + u32 block_size; +- +- buffer = malloc(bufsize); +- if (!buffer) +- return 1; ++ u32 bufsize = 4096; + + attr = ntfs_attr_open(inode, type, name, namelen); + if (!attr) { + ntfs_log_error("Cannot find attribute type 0x%x.\n", + le32_to_cpu(type)); +- free(buffer); + return 1; + } + +@@ -360,6 +355,15 @@ static int cat(ntfs_volume *vol, ntfs_inode *inode, ATTR_TYPES type, + else + block_size = 0; + ++ if (bufsize < block_size) { ++ bufsize = block_size; ++ } ++ ++ buffer = malloc(bufsize); ++ if (!buffer) { ++ return 1; ++ } ++ + offset = 0; + for (;;) { + if (!opts.raw && block_size > 0) { diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 6489ac3d27..5ecda1f66f 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -16,6 +16,7 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-46569.patch \ file://CVE-2026-42618_p1.patch \ file://CVE-2026-42618_p2.patch \ + file://CVE-2026-42616.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c" From patchwork Fri Oct 16 07:46:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 101063 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 66A59CCA48B for ; Fri, 16 Oct 2026 07:46:47 +0000 (UTC) Received: from rcdn-iport-2.cisco.com (rcdn-iport-2.cisco.com [173.37.86.73]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16492.1792136805832795344 for ; Fri, 16 Oct 2026 00:46:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=@cisco.com header.s=iport01 header.b=kY9KikXR; spf=pass (domain: cisco.com, ip: 173.37.86.73, mailfrom: dkelaiya@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=6495; q=dns/txt; s=iport01; t=1792136805; x=1793346405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NzoyyByUokDBuvCMAy/dr1Fx7CWUE0NVP2m8ly9vzg0=; b=kY9KikXRaBOg8fLquT3sU7s38Jld/74Bs6HV9eCz200XU7ZnWHykwG1O x63yoMKzAiZvGYWZEQD6xvx8rvjgxDAgMbCK7q3ZVpPeFCQchxgpJNQe7 UcWXeUTjF/Sqs6ODPF95N9958Y+z6DIq7mM95XsCLb/rw9rLRIzAGL8j5 TXdEo62UMcpiQm/zmO2rVE6qK80YtOV+tbhzvX9xq7lzW+t0CbGyb7DXO nstWdHybL41EO7YcoX/9BPpWM6M+oh8mMb8O7LoSI8EW6Hr/sGKA7wJiz LgIvmB5ruHrdLtdvMzVOhEggx88Eg0183jCLIr3LeB2Uv2wwynM6uhJhT Q==; X-CSE-ConnectionGUID: 2pOMlwJ6TlePXOxyakcGZw== X-CSE-MsgGUID: iwZ/yuavSzS3Dm+2jsWKPQ== X-IPAS-Result: A0BGAgAY1NFq/5L/Ja1aHgEBCxIMggULgld1YENJlkoDnhyBfg8BAQEPRA0EAQGFBQKOFQImNAkOAQIEAwIDAQEBAQEBAQEBAQEBCgEBBQEBAQIBBwWBDhOGTw2QEgECAQMyAUYQHAMBAi8rIwgZgwIBgnQDEb0hgiyBAYNpAkNQ2zIBCxQBgTiFQIgjXRgBhHwnGxuBcoEVg2mBBYFcAQGIAyIEgiKBDIFaHmWUREiBHgNZLAFVEw0KCwcFgWgDNRIqFW4yHYEjPheBBxsGBYEdgSCCFiMZNnqBCV6BKylgARAXgQmCBwKCVIIAAgFJQQ4HRVMJJUMSRyYiCBIJARMaMAuBGzg8CShBFwxzDB0FcggCDQkHKRgNSBEsNxUZBD5uB5IUHoJeBwGBAwoBByMBgQUUU0AekxeSQKEPCiiDdowilToaM4VbnU6HRguYfY4KlTOBHIRpgWg8gUcLB3AVgyIJShkPjisOCxyDRIF/zFsnMgIJMgEBBwIHDgMLgWiRHmABAQ IronPort-Data: A9a23:exSNVaqRpcmLKRshQZRLzRpx5Q9eBmJIZBIvgKrLsJaIsI4StFCzt garIBmHPKuNYGCnf9xyaIux/UtXvpHUyoBnS1E+r303Q3kXpOPIVI+TRqvS04x+DSFioGZPt Zh2hgzodZhsJpPkjk7zdOWn9T8jhfngqoPUUIbsIjp2SRJvVBAvgBdin/9RqoNziLBVOSvV0 T/Ji5OZYgDNNwJcaDpOtfvb8U035ZwehRtB1rAATaET1LPhvyF94KI3fcmZM3b+S49IKe+2L 86r5K255G7Q4yA2AdqjlLvhGmVSKlIFFVHT4pb+c/HKbilq/kTe4I5iXBYvQRs/ZwGyojxE4 I4lWapc5useFvakdOw1C3G0GszlVEFM0OevzXOX6aR/w6BaGpfh660GMa04AWEX0rxvJkRK6 t5GFDQAViCkl/O/w7mUePY506zPLOGzVG8ekmtrwTecCbMtRorOBv2bo9RZxzw3wMtJGJ4yZ eJANmEpN0uGOUASfA5LVvrSn8/w7pX7WzFbpVacpLs+y2PS1wd2lrPqNbI5f/TXH58NwxvC9 zOuE2LRAw4oc82CwCS+4En3quqMxyHgZ6EqLejtnhJtqBjJroAJMzURTVa9rPyzh0KyVt4aJ 0EK9y4Gqakp6FftScHwWRC9qnOIshMQHd1KHIUHBBql0KHY5UOdQ2MDVDMEMI1gv84tTjts3 ViM9z/0OQFSXHSuYSr13t+pQfmaY0D58Udqifc4cDY4 IronPort-HdrOrdr: A9a23:x9pniaCWXuKEgEDlHemO55DYdb4zR+YMi2TDGXofdfUzSL3+qy nAppUmPHPP5Qr5HUtQ++xoW5PwJU80i6QU3WB5B97LN2PbUSmTXeRfBODZrQEIdReTygck79 YCT4FOTPvtEFN9kcH2pCO8E9om3Z271ZrAv5a585+oJjsaE52JKGxCe3+mLnE= X-Talos-CUID: 9a23:HL194W/M6HiEuJwcktmVvxQMPeUhbV+D8HPdG3+fGXdgS7a6e0DFrQ== X-Talos-MUID: 9a23:WgeOhAY+OsC2GOBTtiDewyB/PdlT8Z/1JEVOy5cdhOq8DHkl X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.27,161,1787011200"; d="scan'208";a="522055299" Received: from rcdn-l-core-09.cisco.com ([173.37.255.146]) by rcdn-iport-2.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 16 Oct 2026 07:46:44 +0000 Received: from sjc-ads-5675.cisco.com (sjc-ads-5675.cisco.com [10.28.88.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rcdn-l-core-09.cisco.com (Postfix) with ESMTPS id BE17718000587; Fri, 16 Oct 2026 07:46:44 +0000 (GMT) Received: by sjc-ads-5675.cisco.com (Postfix, from userid 1887444) id 1B61DCBEF98; Fri, 16 Oct 2026 00:46:44 -0700 (PDT) From: "Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-devel@lists.openembedded.org Cc: Darsh Kelaiya Subject: [oe][meta-filesystems][scarthgap][PATCH 7/7] ntfs-3g-ntfsprogs: fix CVE-2026-40706 Date: Fri, 16 Oct 2026 00:46:40 -0700 Message-Id: <20261016074640.3986037-8-dkelaiya@cisco.com> X-Mailer: git-send-email 2.35.6 In-Reply-To: <20261016074640.3986037-1-dkelaiya@cisco.com> References: <20261016074640.3986037-1-dkelaiya@cisco.com> MIME-Version: 1.0 X-Outbound-Client-TLS: ANONYMOUS;sjc-ads-5675.cisco.com [10.28.88.189];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.28.88.189, sjc-ads-5675.cisco.com X-Outbound-Node: rcdn-l-core-09.cisco.com 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, 16 Oct 2026 07:46:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131078 From: Darsh Kelaiya This patch applies the upstream allocation fix shown in [1]. The NVD record describing the vulnerability is referenced in [3]. The fix in [1] allocates space for the worst-case number of POSIX ACL entries in ntfs_build_permissions_posix(). The follow-up in [2] is included to handle allocation failure: check the malloc result, set errno to ENOMEM, and return NULL before using the descriptor. [1] https://github.com/tuxera/ntfs-3g/commit/e48e1ef2a1fcff13a590c2224ec21c5bd5d3e92e [2] https://github.com/tuxera/ntfs-3g/commit/c5413e242309f88ce5a83c0c2538184b19eea1bc [3] https://nvd.nist.gov/vuln/detail/CVE-2026-40706 Signed-off-by: Darsh Kelaiya --- .../files/CVE-2026-40706_p1.patch | 60 +++++++++++++++++++ .../files/CVE-2026-40706_p2.patch | 34 +++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 2 + 3 files changed, 96 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p1.patch create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p2.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p1.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p1.patch new file mode 100644 index 0000000000..22ece5aca3 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p1.patch @@ -0,0 +1,60 @@ +From 696eb743bd94ddbb86e84e544e152845b92a8a7f Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Tue, 24 Feb 2026 10:04:31 +0200 +Subject: [PATCH] acls.c: Fix heap buffer overflow in + 'ntfs_build_permissions_posix'. + +The root cause was that the memory allocated for the ACE entries was +insufficient for the worst case scenario when group entries were added +for mask entries that didn't have a corresponding group entry already. +Fixed by allocating space for the worst case number of ACE entries. + +This was reported by Andrea Bocchetti with a thorough report which made +it very easy to fix. + +CVE: CVE-2026-40706 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/e48e1ef2a1fcff13a590c2224ec21c5bd5d3e92e] + +(cherry picked from commit e48e1ef2a1fcff13a590c2224ec21c5bd5d3e92e) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/acls.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/libntfs-3g/acls.c b/libntfs-3g/acls.c +index 9f16fecd..4cf534bf 100644 +--- a/libntfs-3g/acls.c ++++ b/libntfs-3g/acls.c +@@ -3716,12 +3716,27 @@ struct POSIX_SECURITY *ntfs_build_permissions_posix( + /* + * Build a raw posix security descriptor + * by just translating permissions and ids +- * Add 2 to the count of ACE to be able to insert +- * a group ACE later in access and default ACLs +- * and add 2 more to be able to insert ACEs for owner +- * and 2 more for other ++ * ++ * The worst case number of ACE entries consists of: ++ * - 'acecount' ACE entries from the main loop (see below) ++ * iterating over the 'securattr' array. ++ * - 1 ACE entry which may be added when creating world ++ * permissions if none exist. ++ * - 1 ACE entry which may be added when setting basic owner ++ * permissions if none exist (both lists). ++ * - 1 ACE entry which may be added when duplicating world ++ * permissions as group_obj permissions if none exist. ++ * - 'acecount + 2' ACE entries which may be added when ++ * duplicating world permissions as group permissions if they ++ * were converted to masks and the masks are not followed by a ++ * group entry. ++ * - 1 ACE entry which may be added when inserting a default ++ * mask if none is present and there are designated users or ++ * groups. ++ * ++ * This amounts to 2*acecnt + 6 ACE entries in the worst case. + */ +- alloccnt = acecnt + 6; ++ alloccnt = 2*acecnt + 6; + pxdesc = (struct POSIX_SECURITY*)malloc( + sizeof(struct POSIX_SECURITY) + + alloccnt*sizeof(struct POSIX_ACE)); diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p2.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p2.patch new file mode 100644 index 0000000000..f19f9370bf --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/CVE-2026-40706_p2.patch @@ -0,0 +1,34 @@ +From a0842353864ad42abc30119af2fa5b9f5751d66b Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Tue, 24 Feb 2026 16:35:21 +0200 +Subject: [PATCH] acls.c: Add 'malloc' return value check when allocating POSIX + ACL. + +CVE: CVE-2026-40706 +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/c5413e242309f88ce5a83c0c2538184b19eea1bc] + +(cherry picked from commit c5413e242309f88ce5a83c0c2538184b19eea1bc) +Signed-off-by: Darsh Kelaiya +--- + libntfs-3g/acls.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libntfs-3g/acls.c b/libntfs-3g/acls.c +index 4cf534bf..2d24d65e 100644 +--- a/libntfs-3g/acls.c ++++ b/libntfs-3g/acls.c +@@ -3740,6 +3740,14 @@ struct POSIX_SECURITY *ntfs_build_permissions_posix( + pxdesc = (struct POSIX_SECURITY*)malloc( + sizeof(struct POSIX_SECURITY) + + alloccnt*sizeof(struct POSIX_ACE)); ++ if (!pxdesc) { ++ ntfs_log_perror("Unable to allocate %zu bytes for " ++ "POSIX_SECURITY structure", ++ (size_t)(sizeof(struct POSIX_SECURITY) + ++ alloccnt*sizeof(struct POSIX_ACE))); ++ errno = ENOMEM; ++ return NULL; ++ } + k = 0; + l = alloccnt; + for (i=0; i<2; i++) { diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 5ecda1f66f..d5bc18d2b4 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -17,6 +17,8 @@ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://CVE-2026-42618_p1.patch \ file://CVE-2026-42618_p2.patch \ file://CVE-2026-42616.patch \ + file://CVE-2026-40706_p1.patch \ + file://CVE-2026-40706_p2.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"