From: Hitendra Prajapati <[email protected]> Pick the patch from [1], also referenced in the NVD report [2].
[1] https://github.com/vim/vim/commit/a9336b476fd1a182e3f79b5f83c0ffb04f8a922b [2] https://nvd.nist.gov/vuln/detail/CVE-2026-73074 Signed-off-by: Hitendra Prajapati <[email protected]> Signed-off-by: Yoann Congal <[email protected]> --- .../vim/files/CVE-2026-73074.patch | 115 ++++++++++++++++++ meta/recipes-support/vim/vim.inc | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2026-73074.patch diff --git a/meta/recipes-support/vim/files/CVE-2026-73074.patch b/meta/recipes-support/vim/files/CVE-2026-73074.patch new file mode 100644 index 00000000000..896298b7032 --- /dev/null +++ b/meta/recipes-support/vim/files/CVE-2026-73074.patch @@ -0,0 +1,115 @@ +From a9336b476fd1a182e3f79b5f83c0ffb04f8a922b Mon Sep 17 00:00:00 2001 +From: Yasuhiro Matsumoto <[email protected]> +Date: Thu, 23 Jul 2026 20:14:13 +0000 +Subject: [PATCH] patch 9.2.0841: [security]: heap overflow when adding > 65535 + text properties + +Problem: [security]: heap overflow when adding > 65535 text properties + (Wang1rrr). +Solution: Verify that the number of text properties falls within the + limit (Yasuhiro Matsumoto). + +Github Security Advisory: +https://github.com/vim/vim/security/advisories/GHSA-hm4g-pjfx-m27j + +Signed-off-by: Yasuhiro Matsumoto <[email protected]> +Signed-off-by: Christian Brabandt <[email protected]> + +CVE: CVE-2026-73074 +Upstream-Status: Backport [https://github.com/vim/vim/commit/a9336b476fd1a182e3f79b5f83c0ffb04f8a922b] +Signed-off-by: Hitendra Prajapati <[email protected]> +--- + src/errors.h | 4 ++++ + src/po/vim.pot | 3 +++ + src/testdir/test_textprop.vim | 18 ++++++++++++++++++ + src/textprop.c | 7 +++++++ + src/version.c | 2 ++ + 5 files changed, 34 insertions(+) + +diff --git a/src/errors.h b/src/errors.h +index 53e5b1dda6..1682c8587c 100644 +--- a/src/errors.h ++++ b/src/errors.h +@@ -3812,3 +3812,7 @@ EXTERN char e_gethostbyname_in_channel_listen[] + EXTERN char e_cannot_create_pipes[] + INIT(= N_("E1575: Cannot create pipes")); + #endif ++#ifdef FEAT_PROP_POPUP ++EXTERN char e_too_many_text_properties_on_a_single_line[] ++ INIT(= N_("E1580: Too many text properties on a single line")); ++#endif +diff --git a/src/po/vim.pot b/src/po/vim.pot +index b2e3b0f647..aed7d833cf 100644 +--- a/src/po/vim.pot ++++ b/src/po/vim.pot +@@ -8859,6 +8859,9 @@ msgstr "" + msgid "E1575: Cannot create pipes" + msgstr "" + ++msgid "E1580: Too many text properties on a single line" ++msgstr "" ++ + #. type of cmdline window or 0 + #. result of cmdline window or 0 + #. buffer of cmdline window or NULL +diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim +index f94acfc97c..a293363a8a 100644 +--- a/src/testdir/test_textprop.vim ++++ b/src/testdir/test_textprop.vim +@@ -4907,4 +4907,22 @@ func Test_textprop_materialize_list() + call assert_equal([], prop_list(1, #{ids: 3->range()})) + endfunc + ++" Adding more than 65535 text properties to one line must be rejected instead ++" of wrapping the uint16_t property count and overflowing the allocation. ++func Test_prop_add_over_uint16_max() ++ CheckNotAsan ++ CheckNotValgrind ++ new ++ call setline(1, 'x') ++ call prop_type_add('overflow', {}) ++ for _ in range(0xffff) ++ call prop_add(1, 1, {'type': 'overflow', 'length': 0}) ++ endfor ++ call assert_equal(0xffff, prop_list(1)->len()) ++ call assert_fails("call prop_add(1, 1, {'type': 'overflow', 'length': 0})", 'E1580:') ++ call assert_equal(0xffff, prop_list(1)->len()) ++ call prop_type_delete('overflow') ++ bwipe! ++endfunc ++ + " vim: shiftwidth=2 sts=2 expandtab +diff --git a/src/textprop.c b/src/textprop.c +index 5959ecc45f..fe453244c1 100644 +--- a/src/textprop.c ++++ b/src/textprop.c +@@ -758,6 +758,13 @@ prop_add_one( + proplen = get_text_props(buf, lnum, &props, TRUE); + textlen = ml_get_buf_len(buf, lnum) + 1; + ++ // prop_count is a uint16_t; stop before proplen + 1 wraps to zero. ++ if (proplen >= 0xffff) ++ { ++ emsg(_(e_too_many_text_properties_on_a_single_line)); ++ goto theend; ++ } ++ + if (lnum == start_lnum) + col = start_col; + else +diff --git a/src/version.c b/src/version.c +index 26e4e026c3..2a056f9da5 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -734,6 +734,8 @@ static char *(features[]) = + + static int included_patches[] = + { /* Add new patch number below this line */ ++/**/ ++ 841, + /**/ + 845, + /**/ +-- +2.34.1 + diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 7ab7a405ffc..9dda2c0be55 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -41,6 +41,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV} file://CVE-2026-59858.patch \ file://CVE-2026-73072.patch \ file://CVE-2026-73073.patch \ + file://CVE-2026-73074.patch \ " PV .= ".0340"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#245423): https://lists.openembedded.org/g/openembedded-core/message/245423 Mute This Topic: https://lists.openembedded.org/mt/121158852/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
