From patchwork Mon Mar 9 07:02:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Anil Dongare -X (adongare - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 82838 X-Patchwork-Delegate: yoann.congal@smile.fr 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 8705DEF36EE for ; Mon, 9 Mar 2026 07:02:50 +0000 (UTC) Received: from alln-iport-8.cisco.com (alln-iport-8.cisco.com [173.37.142.95]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.8607.1773039767291029755 for ; Mon, 09 Mar 2026 00:02:47 -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=Q9SpQg/G; spf=pass (domain: cisco.com, ip: 173.37.142.95, mailfrom: adongare@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=3135; q=dns/txt; s=iport01; t=1773039767; x=1774249367; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9uwV+BqYrE9qLM2LeBsreYz3MZePcTEhAlbsjSY3BEU=; b=Q9SpQg/GhghoA5O9ZvSnDuh9gJj8H7vpfRDnC+WDwJupwMFxn1mtEsux 9Ax+0BCiBLZaRxsi1iM+n88RT1v/zls2orE4e06Z4Y6WIpuc3QCNPMFPR xdpyb/TFyOdO/VVbIZeQGnFNkoEwTDNdJDzZGZx4lf9u+32aUueA8dz1m Vgbja43dWEDsaOV0OxkLFMR1K6KBkkxzIr/REzeJ4WobTaFcU0HjjkTYg l99lmZ1MuC/8d58pr1WB49FcgVGskhZLYY6/TIdqpmqyEr0o9seBsNZL0 /I+z7w/dEo4KQ5PraDAYFiNzeeSZQnPtb/e3xjTcNLuA3sb5Q0fsdsuwu w==; X-CSE-ConnectionGUID: j+vylmm3RNGusx+esaSH5Q== X-CSE-MsgGUID: TrOHm8rVRSWzoMulk49o1w== X-IPAS-Result: A0CfBQCub65p/5D/Ja1aHgEBCxIMggULgkgPcV5DSQOWSJ4dgX8PAQEBDz0UBAEBhQeNIgImNAkOAQIEAQEBAQMCAwEBAQEBAQEBAQEBCwEBBQEBAQIBBwWBDhOGTw2GWgECASoLAUYsAwECWiMhG4JnAYJzAxGpdoF5M4EBg2gCQ0/bJgELFAGBOIU8iBlbGAGEeicbG4FygRWDaIEFgVwBAYEnEYZsBIIiehSBYR6FQQaLVkiBHgNZLAFVEw0KCwcFgWYDNRIqFW4yHYEjPheBCxsHBYUgD4hydG6BE4MEAwsYDUgRLDcUGwQ+bgeNaz6CNIEOASuBRWcRkxSST6EOCiiDdIwelToaM4VbpRALmHuLNoJTllCEaIFoPIFHCwdwFYMiCUkZD444g2mBf8dRJjIOLgIHCwEBAwmRagEngVUBAQ IronPort-Data: A9a23:7D+aLazYeoCzSrDAFXl6t+dmxyrEfRIJ4+MujC+fZmUNrF6WrkUHm mEfXj2COPmPZmOjfdB3aY3i/UgD6JDTyd9hGgI9+FhgHilAwSbn6Xt1DatR0we6dJCroJdPt p1GAjX4BJlqCCea/VH1buSJQUBUjcmgXqD7BPPPJhd/TAplTDZJoR94kobVuKYw6TSCK13L4 4iaT/H3Ygf/hWYvajNMsspvlTs21BjMkGJA1rABTagjUG/2zxE9EJ8ZLKetGHr0KqE8NvK6X evK0Iai9Wrf+Ro3Yvv9+losWhRXKlJ6FVHmZkt+A8BOsDAbzsAB+vpT2M4nVKtio27hc+adZ zl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CCe5xWuTpfi/xlhJEN1I5wc/+MsO0dh6 OcIaz0WZyuj2tvjldpXSsE07igiBNPgMIVavjRryivUSK55B5vCWK7No9Rf2V/chOgXQq2YP JVfM2cyKk2cP3WjOX9PYH46tO6kgX/weidVgFmUvqEwpWPUyWSd1ZCzYIeEJYPWHp49ckCwm njh32GpGC8gD+ONzh+Y9nHw1+iWgnauMG4VPPjinhJwu3WU3mEVBRgcWFe3rPX8gUmkVvpbK lcI4WwptaU0+UmhQ9XxUhH+p2SL1iPwQPJKGOE8rQXIwa3O7kPBWS4PTyVKb5ots8peqSEW6 2JlVujBXVRH2IB5g1rEnltIhVte4RQoEFI= IronPort-HdrOrdr: A9a23:Gp78oK0uzCQEBXhoy3tp8wqjBLkkLtp133Aq2lEZdPWaSKOlfq eV7ZEmPHDP6Qr5NEtMpTniAtjjfZq/z/5ICOAqVN/INjUO01HHEGgN1+ffKkXbak7DHio379 YGT0C4Y+eAaWRHsQ== X-Talos-CUID: 9a23:g0DM3GvXSXCtgY5zEw7rhmZU6IsnMWPMyHLVeHWeJntyWP6YUlar2P5dxp8= X-Talos-MUID: 9a23:xQ4CKQ7ZDWOHkepLyv2J17COxoxU+YOODRAXr689hNuDEDF0OGvMi22oF9o= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.23,109,1770595200"; d="scan'208";a="685977433" Received: from rcdn-l-core-07.cisco.com ([173.37.255.144]) by alln-iport-8.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 09 Mar 2026 07:02:46 +0000 Received: from sjc-ads-10055.cisco.com (sjc-ads-10055.cisco.com [10.30.210.59]) (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-07.cisco.com (Postfix) with ESMTPS id 393811800049D; Mon, 9 Mar 2026 07:02:46 +0000 (GMT) Received: by sjc-ads-10055.cisco.com (Postfix, from userid 1870532) id D814ACC12A6; Mon, 9 Mar 2026 00:02:45 -0700 (PDT) From: "Anil Dongare -X (adongare - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-core@lists.openembedded.org Cc: xe-linux-external@cisco.com, to@cisco.com, Anil Dongare Subject: [OE-core] [Whinlatter] [PATCH 1/2] vim v9.1.1683: Fix CVE-2026-25749 Date: Mon, 9 Mar 2026 00:02:31 -0700 Message-ID: <20260309070233.4148849-1-adongare@cisco.com> X-Mailer: git-send-email 2.44.1 MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.30.210.59, sjc-ads-10055.cisco.com X-Outbound-Node: rcdn-l-core-07.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 ; Mon, 09 Mar 2026 07:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/232678 From: Anil Dongare Upstream Repository: https://github.com/vim/vim.git Bug Details: https://nvd.nist.gov/vuln/detail/CVE-2026-25749 Type: Security Fix CVE: CVE-2026-25749 Score: 6.6 Patch: https://github.com/vim/vim/commit/0714b15940b2 Signed-off-by: Anil Dongare --- .../vim/files/CVE-2026-25749.patch | 57 +++++++++++++++++++ meta/recipes-support/vim/vim.inc | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2026-25749.patch diff --git a/meta/recipes-support/vim/files/CVE-2026-25749.patch b/meta/recipes-support/vim/files/CVE-2026-25749.patch new file mode 100644 index 0000000000..1e3779d3c4 --- /dev/null +++ b/meta/recipes-support/vim/files/CVE-2026-25749.patch @@ -0,0 +1,57 @@ +From 04c5e03c2c638e6c82c250f7b612eab29fe7d9ba Mon Sep 17 00:00:00 2001 +From: Christian Brabandt +Date: Thu, 5 Feb 2026 18:51:54 +0000 +Subject: [PATCH] patch 9.1.2132: [security]: buffer-overflow in 'helpfile' + option handling + +Problem: [security]: buffer-overflow in 'helpfile' option handling by + using strcpy without bound checks (Rahul Hoysala) +Solution: Limit strncpy to the length of the buffer (MAXPATHL) + +Github Advisory: +https://github.com/vim/vim/security/advisories/GHSA-5w93-4g67-mm43 + +CVE: CVE-2026-25749 +Upstream-Status: Backport [https://github.com/vim/vim/commit/0714b15940b2] + +Signed-off-by: Christian Brabandt +(cherry picked from commit 0714b15940b245108e6e9d7aa2260dd849a26fa9) +Signed-off-by: Anil Dongare +--- + src/tag.c | 2 +- + src/testdir/test_help.vim | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/tag.c b/src/tag.c +index 6912e8743..a32bbb245 100644 +--- a/src/tag.c ++++ b/src/tag.c +@@ -3348,7 +3348,7 @@ get_tagfname( + if (tnp->tn_hf_idx > tag_fnames.ga_len || *p_hf == NUL) + return FAIL; + ++tnp->tn_hf_idx; +- STRCPY(buf, p_hf); ++ vim_strncpy(buf, p_hf, MAXPATHL - 1); + STRCPY(gettail(buf), "tags"); + #ifdef BACKSLASH_IN_FILENAME + slash_adjust(buf); +diff --git a/src/testdir/test_help.vim b/src/testdir/test_help.vim +index dac153d86..f9e4686bb 100644 +--- a/src/testdir/test_help.vim ++++ b/src/testdir/test_help.vim +@@ -222,4 +222,13 @@ func Test_helptag_navigation() + endfunc + + ++" This caused a buffer overflow ++func Test_helpfile_overflow() ++ let _helpfile = &helpfile ++ let &helpfile = repeat('A', 5000) ++ help ++ helpclose ++ let &helpfile = _helpfile ++endfunc ++ + " vim: shiftwidth=2 sts=2 expandtab +-- +2.43.7 diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index c730f1d0cf..044117a57f 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV} file://disable_acl_header_check.patch \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ + file://CVE-2026-25749.patch \ " PV .= ".1683" From patchwork Mon Mar 9 07:02:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Anil Dongare -X (adongare - E INFOCHIPS PRIVATE LIMITED at Cisco)" X-Patchwork-Id: 82839 X-Patchwork-Delegate: yoann.congal@smile.fr 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 87BAAEF36EF for ; Mon, 9 Mar 2026 07:02:50 +0000 (UTC) Received: from alln-iport-1.cisco.com (alln-iport-1.cisco.com [173.37.142.88]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.8671.1773039767508467321 for ; Mon, 09 Mar 2026 00:02:47 -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=YS2gc7UV; spf=pass (domain: cisco.com, ip: 173.37.142.88, mailfrom: adongare@cisco.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=6426; q=dns/txt; s=iport01; t=1773039767; x=1774249367; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kduezb8m1GuaCfRETk5Xhv6oPj5eGmPxdcRUPIJwaLk=; b=YS2gc7UVlNFcJC/uhGHPFIwlILwOVFPsrABsiu2vUO2VI744wLfsWmEz G5SjdFYcvFsPhu31nlUw9zsBLby9KviuS83vZ4FnSFeBiAAdWWG/mcIWc g+jwSRD5NEJU9a9Kiuno2NqDKv49k9veH+m5nsEAX3BYyVb+24L05pFK/ tw+KQ2BOmx91/Ntsnj35dpN+1D0pYdwWCHDVN/pmqtIbl02mqsZXXfNNs 6nDtF8yx06J5mz2Frf3n/vmX3uga28x5zZAX660E30tJfcvyozC8pacMy av9pRUmVWuRm7nw6oZSW9Zyn41yLSG122VNv8N5yL61dw6Nst9TzkQZcX w==; X-CSE-ConnectionGUID: EwVO6HPnSxuOPB7iB4nkgg== X-CSE-MsgGUID: l5BgGcLSQcSxuC8EipH0Ww== X-IPAS-Result: A0BDAACub65p/5T/Ja1aHAEBAQEBAQcBARIBAQQEAQGBfAcBAQsBgkcPcV5DSQOMcIlYA54aFIFrDwEBAQ89FAQBAYUHAo0gAiY0CQ4BAgQBAQEBAwIDAQEBAQEBAQEBAQELAQEFAQEBAgEHBYEOE4ZPDYZaAQIBAycLAUYQHAMBAi8rIwgZG4JnAYJzAxGpdoF5M4EBg2gCQ0/bJgELFAGBOAGFO4gZWxgBhHonGxuBcoEVg2iBBYFcAQGBIhYQhlwEgiJ6FIFhHoVBBotWSIEeA1ksAVUTDQoLBwWBZgM1EioVbjIdgSM+F4ELGwcFhSAPiHJ0boETgwQDCxgNSBEsNxQbBD5uB41rPoI0exMBK4EFDDICZwYLKZJrE5I8oQ4KKIN0jB6VOhozhVulEAuYe4s2glOVaGiEaIFoPIFHCwdwFYMiCUkZD44qDguDXoF/x1EmMg4uAgcLAQEDCZFrgXwBAQ IronPort-Data: A9a23:XDU/R61WCkNSiSQjoPbD5YJwkn2cJEfYwER7XKvMYLTBsI5bp2AFz mcYDW7XOPjeM2KkeI1wad6+/UxTupDUxtRjT1do3Hw8FHgiRegpqji6wuYcGwvIc6UvmWo+t 512huHodZ5yFjmH4E/xbtANlFEkvYmQXL3wFeXYDS54QA5gWU8JhAlq8wIDqtYAbeORXUXX4 rsen+WFYAX7g2UsYzpNg06+gEoHUMra6WtwUmMWPZinjHeG/1EJAZQWI72GLneQauF8Au6gS u/f+6qy92Xf8g1FIovNfmHTKxBirhb6ZGBiu1IOM0SQqkEqSh8ajs7XAMEhhXJ/0F1lqTzeJ OJl7vRcQS9xVkHFdX90vxNwS0mSNoUekFPLzOTWXcG7lyX7n3XQL/pGIV4IGtM4wuBMEXxpz dZHKRpRaBOMiLfjqF67YrEEasULNsLnOsYb/3pn1zycVK9gSpHYSKKM7thdtNsyrpkRRrCFO IxDNGcpNUiQC/FMEg9/5JYWleuvgHb2aTBwo1OOrq1x6G/WpOB0+Oa8aIaIJ4zUG625mG6c+ 0jJ0G/dOSgRD8yC4mqo82qM3tDQyHaTtIU6UefQGuRRqFqLy2oeDRcbWVe2rbyyjVSzc9ZeM FAPvC02oK4/8UamQtXwU1u/unHsg/IHc8BbH+t/7ESGzbDZpl/AQGMFVTVGLtchsafaWAAX6 7NApPuxbRQHjVFfYSj1Gmu8xd9qBRUoEA== IronPort-HdrOrdr: A9a23:/Vxbnq9u53MXC1FVxMBuk+DfI+orL9Y04lQ7vn2ZhyY7TiX+rb HIoB11737JYVoqNU3I3OrwWpVoIkmskaKdg7NwAV7KZmCP0wGVxcNZnO7fKlbbdREWmNQw6U 4ZSdkcNDU1ZmIK9PoTJ2KDYrAd/OU= X-Talos-CUID: 9a23:EmXjg28abFGpU2jdwBmVv2MLJOd7UkXb92fNBHeSVmdDFLuWRlDFrQ== X-Talos-MUID: 9a23:VN5gWgrLUurdiCFQQKgezzU/HshH6ICVMUs2gYgt6+SFLQwoBCjI2Q== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.23,109,1770595200"; d="scan'208";a="690455866" Received: from rcdn-l-core-11.cisco.com ([173.37.255.148]) by alln-iport-1.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 09 Mar 2026 07:02:46 +0000 Received: from sjc-ads-10055.cisco.com (sjc-ads-10055.cisco.com [10.30.210.59]) (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-11.cisco.com (Postfix) with ESMTPS id 3D92518000140; Mon, 9 Mar 2026 07:02:46 +0000 (GMT) Received: by sjc-ads-10055.cisco.com (Postfix, from userid 1870532) id DB4C8CC12A7; Mon, 9 Mar 2026 00:02:45 -0700 (PDT) From: "Anil Dongare -X (adongare - E INFOCHIPS PRIVATE LIMITED at Cisco)" To: openembedded-core@lists.openembedded.org Cc: xe-linux-external@cisco.com, to@cisco.com, Anil Dongare Subject: [OE-core] [Whinlatter] [PATCH 2/2] vim v9.1.1683: Fix CVE-2026-26269 Date: Mon, 9 Mar 2026 00:02:32 -0700 Message-ID: <20260309070233.4148849-2-adongare@cisco.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20260309070233.4148849-1-adongare@cisco.com> References: <20260309070233.4148849-1-adongare@cisco.com> MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.30.210.59, sjc-ads-10055.cisco.com X-Outbound-Node: rcdn-l-core-11.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 ; Mon, 09 Mar 2026 07:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/232679 From: Anil Dongare Upstream Repository: https://github.com/vim/vim.git Bug Details: https://nvd.nist.gov/vuln/detail/CVE-2026-26269 Type: Security Fix CVE: CVE-2026-26269 Score: 7.5 Patch: https://github.com/vim/vim/commit/c5f312aad8e4 Signed-off-by: Anil Dongare --- .../vim/files/CVE-2026-26269.patch | 143 ++++++++++++++++++ meta/recipes-support/vim/vim.inc | 1 + 2 files changed, 144 insertions(+) create mode 100644 meta/recipes-support/vim/files/CVE-2026-26269.patch diff --git a/meta/recipes-support/vim/files/CVE-2026-26269.patch b/meta/recipes-support/vim/files/CVE-2026-26269.patch new file mode 100644 index 0000000000..fd4a652506 --- /dev/null +++ b/meta/recipes-support/vim/files/CVE-2026-26269.patch @@ -0,0 +1,143 @@ +From b4fb08c06ee37e38c257d800347b062b78fed141 Mon Sep 17 00:00:00 2001 +From: Christian Brabandt +Date: Fri, 13 Feb 2026 10:27:12 +0100 +Subject: [PATCH] patch 9.1.2148: [security]: Buffer overflow in netbeans + interface + +Problem: [security]: Buffer overflow in netbeans special_keys() handling +Solution: Limit writing to max KEYBUFLEN bytes to prevent writing out of + bounds. + +Github Advisory: +https://github.com/vim/vim/security/advisories/GHSA-9w5c-hwr9-hc68 + +CVE: CVE-2026-26269 +Upstream-Status: Backport [https://github.com/vim/vim/commit/c5f312aad8e4] + +Signed-off-by: Christian Brabandt +(cherry picked from commit c5f312aad8e4179e437f81ad39a860cd0ef11970) +Signed-off-by: Anil Dongare +--- + runtime/doc/version9.txt | 5 +++ + src/netbeans.c | 2 +- + src/testdir/test_netbeans.py | 4 ++- + src/testdir/test_netbeans.vim | 57 +++++++++++++++++++++++++++++++++++ + 4 files changed, 66 insertions(+), 2 deletions(-) + +diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt +index b82071757..b32400f17 100644 +--- a/runtime/doc/version9.txt ++++ b/runtime/doc/version9.txt +@@ -41899,4 +41899,9 @@ features, but does not include runtime file changes (syntax, indent, ftplugin, + documentation, etc.) + + ++Patch 9.1.2148 ++Problem: [security]: Buffer overflow in netbeans special_keys() handling ++Solution: Limit writing to max KEYBUFLEN bytes to prevent writing out of ++ bounds. ++ + vim:tw=78:ts=8:noet:ft=help:norl:fdm=manual:nofoldenable +diff --git a/src/netbeans.c b/src/netbeans.c +index 4f5378512..8a341a20b 100644 +--- a/src/netbeans.c ++++ b/src/netbeans.c +@@ -2302,7 +2302,7 @@ special_keys(char_u *args) + if ((sep = strchr(tok, '-')) != NULL) + { + *sep = NUL; +- while (*tok) ++ while (*tok && i + 2 < KEYBUFLEN) + { + switch (*tok) + { +diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py +index 0d6b09680..585886fb4 100644 +--- a/src/testdir/test_netbeans.py ++++ b/src/testdir/test_netbeans.py +@@ -112,7 +112,9 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): + 'startAtomic_Test' : '0:startAtomic!94\n', + 'endAtomic_Test' : '0:endAtomic!95\n', + 'AnnoScale_Test' : "".join(['2:defineAnnoType!60 ' + str(i) + ' "s' + str(i) + '" "x" "=>" blue none\n' for i in range(2, 26)]), +- 'detach_Test' : '2:close!96\n1:close!97\nDETACH\n' ++ 'detach_Test' : '2:close!96\n1:close!97\nDETACH\n', ++ 'specialKeys_overflow_Test' : '0:specialKeys!200 "' + 'A'*80 + '-X"\n' ++ + } + # execute the specified test + if cmd not in testmap: +diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim +index d3d5e8baf..d1be5066e 100644 +--- a/src/testdir/test_netbeans.vim ++++ b/src/testdir/test_netbeans.vim +@@ -958,6 +958,58 @@ func Nb_bwipe_buffer(port) + sleep 10m + endfunc + ++func Nb_specialKeys_overflow(port) ++ call delete("Xnetbeans") ++ call writefile([], "Xnetbeans") ++ ++ " Last line number in the Xnetbeans file. Used to verify the result of the ++ " communication with the netbeans server ++ let g:last = 0 ++ ++ " Establish the connection with the netbeans server ++ exe 'nbstart :localhost:' .. a:port .. ':bunny' ++ call WaitFor('len(ReadXnetbeans()) > (g:last + 2)') ++ let l = ReadXnetbeans() ++ call assert_equal(['AUTH bunny', ++ \ '0:version=0 "2.5"', ++ \ '0:startupDone=0'], l[-3:]) ++ let g:last += 3 ++ ++ " Open the command buffer to communicate with the server ++ split Xcmdbuf ++ let cmdbufnr = bufnr() ++ call WaitFor('len(ReadXnetbeans()) > (g:last + 2)') ++ let l = ReadXnetbeans() ++ call assert_equal('0:fileOpened=0 "Xcmdbuf" T F', ++ \ substitute(l[-3], '".*/', '"', '')) ++ call assert_equal('send: 1:putBufferNumber!15 "Xcmdbuf"', ++ \ substitute(l[-2], '".*/', '"', '')) ++ call assert_equal('1:startDocumentListen!16', l[-1]) ++ let g:last += 3 ++ ++ " Keep the command buffer loaded for communication ++ hide ++ ++ sleep 1m ++ ++ " Open the command buffer to communicate with the server ++ split Xcmdbuf ++ let cmdbufnr = bufnr() ++ call appendbufline(cmdbufnr, '$', 'specialKeys_overflow_Test') ++ call WaitFor('len(ReadXnetbeans()) >= (g:last + 6)') ++ call WaitForAssert({-> assert_match('send: 0:specialKeys!200 "A\{80}-X"', ++ \ ReadXnetbeans()[-1])}) ++ ++ " Verify that specialKeys test, still works after the previous junk ++ call appendbufline(cmdbufnr, '$', 'specialKeys_Test') ++ call WaitFor('len(ReadXnetbeans()) >= (g:last + 1)') ++ call WaitForAssert({-> assert_match('^send: 0:specialKeys!91 "F12 F13 C-F13"$', ++ \ ReadXnetbeans()[-1])}) ++ let g:last += 1 ++ ++ sleep 10m ++endfunc ++ + " This test used to reference a buffer after it was freed leading to an ASAN + " error. + func Test_nb_bwipe_buffer() +@@ -967,4 +1019,9 @@ func Test_nb_bwipe_buffer() + nbclose + endfunc + ++" Verify that the specialKeys argument does not overflow ++func Test_nb_specialKeys_overflow() ++ call s:run_server('Nb_specialKeys_overflow') ++endfunc ++ + " vim: shiftwidth=2 sts=2 expandtab +-- +2.43.7 diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 044117a57f..792a46faf7 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV} file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ file://CVE-2026-25749.patch \ + file://CVE-2026-26269.patch \ " PV .= ".1683"