vim: Security Fix for CVE-2026-57452

Picking patch as per [1], and same patch is mentioned in [2]

References:
[1] https://nvd.nist.gov/vuln/detail/CVE-2026-57452
[2] https://security-tracker.debian.org/tracker/CVE-2026-57452

(From OE-Core rev: 140b752df903df36a10ffeb1f2bca7b2e3bb8a06)

Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Siddharth Doshi
2026-07-23 14:53:50 +05:30
committed by Richard Purdie
parent 68da6e5e76
commit d4b6cf3a61
2 changed files with 77 additions and 0 deletions

View File

@@ -0,0 +1,76 @@
From c8777cec25dcfae89c42e9aff51af61f71c5745f Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Thu, 18 Jun 2026 18:41:16 +0000
Subject: [PATCH] patch 9.2.0671: [security]: possible out-of-bounds read with
sodium encrypted files
Problem: [security]: possible out-of-bounds read with sodium encrypted
files (cipher-creator)
Solution: Verify that there is enough space before calling
crypto_secretstream_xchacha20poly1305_init_pull()
Github Security Advisory:
https://github.com/vim/vim/security/advisories/GHSA-c4j9-wr9j-4486
Supported by AI
Signed-off-by: Christian Brabandt <cb@256bit.org>
Upstream-Status: Backport [https://github.com/vim/vim/commit/c8777cec25dcfae89c42e9aff51af61f71c5745f]
CVE: CVE-2026-57452
Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
---
src/crypt.c | 3 ++-
src/testdir/test_crypt.vim | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/crypt.c b/src/crypt.c
index 55edd6c6de..a11d204e5e 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1257,7 +1257,8 @@ crypt_sodium_buffer_decode(
if (sod_st->count == 0)
{
- if (crypto_secretstream_xchacha20poly1305_init_pull(&sod_st->state,
+ if (len < crypto_secretstream_xchacha20poly1305_HEADERBYTES ||
+ crypto_secretstream_xchacha20poly1305_init_pull(&sod_st->state,
from, sod_st->key) != 0)
{
emsg(_(e_libsodium_decryption_failed_header_incomplete));
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 4a96c30702..151a4dea17 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -459,4 +459,28 @@ func Test_crypt_set_key_disallow_append_subtract()
bwipe!
endfunc
+func Test_crypt_sodium_short_body()
+ CheckFeature sodium
+ " A VimCrypt~04! file with a complete 36-byte header (12 magic + 16 salt +
+ " 8 seed) but a body shorter than one secretstream header (24 bytes) used to
+ " underflow the body length and crash with a wild out-of-bounds read in
+ " crypto_secretstream_xchacha20poly1305_pull(). It must now fail cleanly.
+ " Bytes: "VimCrypt~04!" + 16 salt + 8 seed + 8-byte body = 44 bytes.
+ call writefile(0z56696D43727970747E303421
+ \ + 0zA0A1A2A3A4A5A6A7A8A9AAABACADAEAF
+ \ + 0zB0B1B2B3B4B5B6B7
+ \ + 0z0000000000000000, 'Xtest_sodium_short')
+
+ let v:errmsg = ''
+ try
+ call feedkeys(":split Xtest_sodium_short\<CR>foobar\<CR>", "xt")
+ catch /^Vim\%((\S\+)\)\=:E1198:/
+ " no-op
+ endtry
+
+ bwipe!
+ call delete('Xtest_sodium_short')
+ set key=
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
--
2.44.4

View File

@@ -44,6 +44,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
file://CVE-2026-55693.patch \
file://CVE-2026-55892.patch \
file://CVE-2026-55895.patch \
file://CVE-2026-57452.patch \
"
PV .= ".1683"