From 3b6f43e0a51859940169a3441deec8d570e321ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Apr 2025 09:57:51 +0200 Subject: [PATCH 1/6] v8.0.3 --- .gitignore | 1 + sources | 2 +- valkey.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 21c040e..6e77b87 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /valkey-doc-8.0.1.tar.gz /valkey-8.0.2.tar.gz /valkey-doc-8.0.2.tar.gz +/valkey-8.0.3.tar.gz diff --git a/sources b/sources index 052bf71..47d3d7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-8.0.2.tar.gz) = 432e9b869234b784edcf644b1062bbc0ff1eb79e49c6fb7e66d5db9ddf0e089dfdccf5e5d5201119976699d4dab1b5ddb865767a8087551e9c8f2eff5d157df9 +SHA512 (valkey-8.0.3.tar.gz) = 3639855d2eced9dd1b38e95e46c515441c850b4fb087c45b2c81a15c5e864555281715fa90b47dc60260485c9469f523f1fac716b3e2114cf7e05c39833e6c96 SHA512 (valkey-doc-8.0.2.tar.gz) = 205eefb7aea66bc7750307b0c9c72c59cc472c12d3f593d4dfcfcc0d68446593c30f84ef697323bccdf5be4518058d13027d414deeebe2330603b22c9c83eb50 diff --git a/valkey.spec b/valkey.spec index c860eb2..06b7f79 100644 --- a/valkey.spec +++ b/valkey.spec @@ -4,12 +4,13 @@ %else %bcond_with docs %endif +%global doc_version 8.0.2 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -25,7 +26,7 @@ Source3: %{name}.service Source4: %{name}.sysusers Source8: macros.%{name} Source9: migrate_redis_to_valkey.sh -Source50: https://github.com/valkey-io/%{name}-doc/archive/%{version}/%{name}-doc-%{version}.tar.gz +Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz BuildRequires: make BuildRequires: gcc @@ -204,7 +205,7 @@ echo '# valkey-sentinel_rpm_conf' >> sentinel.conf %if %{with docs} # docs -pushd %{name}-doc-%{version} +pushd %{name}-doc-%{doc_version} # build man pages %make_build VALKEY_ROOT=../ # build html docs @@ -217,7 +218,7 @@ popd %make_install %{make_flags} %if %{with docs} # install docs -pushd %{name}-doc-%{version} +pushd %{name}-doc-%{doc_version} # man pages %make_install INSTALL_MAN_DIR=%{buildroot}%{_mandir} VALKEY_ROOT=../ # install html docs @@ -399,6 +400,10 @@ fi %changelog +* Thu Apr 24 2025 Remi Collet - 8.0.3-1 +- update to 8.0.3 + fixes CVE-2025-21605 + * Sun Jan 19 2025 Fedora Release Engineering - 8.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 372fde33093cad536b4b42841d98147fdaf5c85b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Apr 2025 09:57:51 +0200 Subject: [PATCH 2/6] v8.0.3 (cherry picked from commit 3b6f43e0a51859940169a3441deec8d570e321ff) --- .gitignore | 1 + sources | 2 +- valkey.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 21c040e..6e77b87 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /valkey-doc-8.0.1.tar.gz /valkey-8.0.2.tar.gz /valkey-doc-8.0.2.tar.gz +/valkey-8.0.3.tar.gz diff --git a/sources b/sources index 052bf71..47d3d7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-8.0.2.tar.gz) = 432e9b869234b784edcf644b1062bbc0ff1eb79e49c6fb7e66d5db9ddf0e089dfdccf5e5d5201119976699d4dab1b5ddb865767a8087551e9c8f2eff5d157df9 +SHA512 (valkey-8.0.3.tar.gz) = 3639855d2eced9dd1b38e95e46c515441c850b4fb087c45b2c81a15c5e864555281715fa90b47dc60260485c9469f523f1fac716b3e2114cf7e05c39833e6c96 SHA512 (valkey-doc-8.0.2.tar.gz) = 205eefb7aea66bc7750307b0c9c72c59cc472c12d3f593d4dfcfcc0d68446593c30f84ef697323bccdf5be4518058d13027d414deeebe2330603b22c9c83eb50 diff --git a/valkey.spec b/valkey.spec index da238d1..f547f66 100644 --- a/valkey.spec +++ b/valkey.spec @@ -4,11 +4,12 @@ %else %bcond_with docs %endif +%global doc_version 8.0.2 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 8.0.2 +Version: 8.0.3 Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause @@ -25,7 +26,7 @@ Source3: %{name}.service Source4: %{name}.sysusers Source8: macros.%{name} Source9: migrate_redis_to_valkey.sh -Source50: https://github.com/valkey-io/%{name}-doc/archive/%{version}/%{name}-doc-%{version}.tar.gz +Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz BuildRequires: make BuildRequires: gcc @@ -204,7 +205,7 @@ echo '# valkey-sentinel_rpm_conf' >> sentinel.conf %if %{with docs} # docs -pushd %{name}-doc-%{version} +pushd %{name}-doc-%{doc_version} # build man pages %make_build VALKEY_ROOT=../ # build html docs @@ -217,7 +218,7 @@ popd %make_install %{make_flags} %if %{with docs} # install docs -pushd %{name}-doc-%{version} +pushd %{name}-doc-%{doc_version} # man pages %make_install INSTALL_MAN_DIR=%{buildroot}%{_mandir} VALKEY_ROOT=../ # install html docs @@ -399,6 +400,10 @@ fi %changelog +* Thu Apr 24 2025 Remi Collet - 8.0.3-1 +- update to 8.0.3 + fixes CVE-2025-21605 + * Wed Jan 08 2025 Jonathan Wright - 8.0.2-1 - update to 8.0.2 rhbz#2336259 fixes CVE-2024-46981 From 77ac0bbb2c6339c27a18582accb442239bd88f73 Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Fri, 6 Jun 2025 09:49:49 -0500 Subject: [PATCH 3/6] Fixes CVE-2025-49112 --- 0001-valkey-cve-2025-49112.patch | 23 +++++++++++++++++++++++ valkey.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-valkey-cve-2025-49112.patch diff --git a/0001-valkey-cve-2025-49112.patch b/0001-valkey-cve-2025-49112.patch new file mode 100644 index 0000000..fcb8b15 --- /dev/null +++ b/0001-valkey-cve-2025-49112.patch @@ -0,0 +1,23 @@ +From 0b8147ca27d2d06efadf37f0f064f19607e7e1f8 Mon Sep 17 00:00:00 2001 +From: Zeroday BYTE +Date: Tue, 20 May 2025 00:59:10 +0700 +Subject: [PATCH] Update networking.c + +Signed-off-by: Zeroday BYTE +--- + src/networking.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/networking.c b/src/networking.c +index 5f57050971..78b62d0c59 100644 +--- a/src/networking.c ++++ b/src/networking.c +@@ -883,7 +883,7 @@ void setDeferredReply(client *c, void *node, const char *s, size_t length) { + * - It has enough room already allocated + * - And not too large (avoid large memmove) + * - And the client is not in a pending I/O state */ +- if (ln->prev != NULL && (prev = listNodeValue(ln->prev)) && prev->size - prev->used > 0 && ++ if (ln->prev != NULL && (prev = listNodeValue(ln->prev)) && prev->used < prev->size && + c->io_write_state != CLIENT_PENDING_IO) { + size_t len_to_copy = prev->size - prev->used; + if (len_to_copy > length) len_to_copy = length; diff --git a/valkey.spec b/valkey.spec index 06b7f79..f0ac31d 100644 --- a/valkey.spec +++ b/valkey.spec @@ -10,7 +10,7 @@ Name: valkey Version: 8.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -28,6 +28,8 @@ Source8: macros.%{name} Source9: migrate_redis_to_valkey.sh Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz +Patch: 0001-valkey-cve-2025-49112.patch + BuildRequires: make BuildRequires: gcc %if %{with tests} @@ -400,6 +402,9 @@ fi %changelog +* Fri Jun 06 2025 Jonathan Wright - 8.0.3-2 +- Fixes CVE-2025-49112 + * Thu Apr 24 2025 Remi Collet - 8.0.3-1 - update to 8.0.3 fixes CVE-2025-21605 From 45bd783dc0ac8a8277d63e9704bc49cbfe3844cf Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Fri, 6 Jun 2025 15:53:36 -0500 Subject: [PATCH 4/6] Apply patch for CVE-2025-49112 properly --- valkey.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/valkey.spec b/valkey.spec index f0ac31d..dee02b1 100644 --- a/valkey.spec +++ b/valkey.spec @@ -10,7 +10,7 @@ Name: valkey Version: 8.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -28,7 +28,7 @@ Source8: macros.%{name} Source9: migrate_redis_to_valkey.sh Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz -Patch: 0001-valkey-cve-2025-49112.patch +Patch0: 0001-valkey-cve-2025-49112.patch BuildRequires: make BuildRequires: gcc @@ -159,6 +159,8 @@ Provides: redis-doc = %{version}-%{release} # no autosetup due to no support for multiple source extraction %setup -n %{name}-%{version} -a50 +%patch 0 -p1 + mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc mv deps/hiredis/COPYING COPYING-hiredis-BSD-3-Clause @@ -402,6 +404,9 @@ fi %changelog +* Fri Jun 06 2025 Jonathan Wright - 8.0.3-3 +- Apply patch for CVE-2025-49112 properly + * Fri Jun 06 2025 Jonathan Wright - 8.0.3-2 - Fixes CVE-2025-49112 From b90999a05fc1ab144f7a895575d73d0890ab72d4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Jul 2025 08:15:07 +0200 Subject: [PATCH 5/6] update to 8.0.4 fixes CVE-2025-27151 CVE-2025-48367 and CVE-2025-32023 (cherry picked from commit 89cb4d72623d307c5b6b691e442c00f9530c4ba5) --- .gitignore | 10 ++++------ sources | 4 ++-- valkey-cve-2025-27151.patch | 34 ++++++++++++++++++++++++++++++++++ valkey.spec | 14 ++++++++++---- 4 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 valkey-cve-2025-27151.patch diff --git a/.gitignore b/.gitignore index 6e77b87..c84f339 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,9 @@ -/valkey-7.2.4-rc1.tar.gz -/valkey-7.2.5-rc1.tar.gz -/valkey-7.2.5.tar.gz -/valkey-7.2.6.tar.gz -/valkey-8.0.0.tar.gz -/valkey-doc-8.0.0.tar.gz +/valkey-8.1.*.tar.gz +/valkey-doc-8.1.*.tar.gz /valkey-8.0.1.tar.gz /valkey-doc-8.0.1.tar.gz /valkey-8.0.2.tar.gz /valkey-doc-8.0.2.tar.gz /valkey-8.0.3.tar.gz +/valkey-8.0.4.tar.gz +/valkey-doc-8.0.3.tar.gz diff --git a/sources b/sources index 47d3d7e..470e536 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-8.0.3.tar.gz) = 3639855d2eced9dd1b38e95e46c515441c850b4fb087c45b2c81a15c5e864555281715fa90b47dc60260485c9469f523f1fac716b3e2114cf7e05c39833e6c96 -SHA512 (valkey-doc-8.0.2.tar.gz) = 205eefb7aea66bc7750307b0c9c72c59cc472c12d3f593d4dfcfcc0d68446593c30f84ef697323bccdf5be4518058d13027d414deeebe2330603b22c9c83eb50 +SHA512 (valkey-8.0.4.tar.gz) = 2e6969a2c791f39943fe31c9c6dc5432accc37212c586f891f997df6dc74c0329d9f7254c54842f8203c8427f903e016cd465747d221349396327649ffa340fb +SHA512 (valkey-doc-8.0.3.tar.gz) = 7a44a6abc353d2a3af814ad7d243a59e6543d3af66f4aba07085eedc86ec7ced19af74993752285c31c7238d54d36392603afcb987c6618ea55ec0ca08322b45 diff --git a/valkey-cve-2025-27151.patch b/valkey-cve-2025-27151.patch new file mode 100644 index 0000000..275db2e --- /dev/null +++ b/valkey-cve-2025-27151.patch @@ -0,0 +1,34 @@ +From 73696bf6e2cf754acc3ec24eaf9ca6b879bfc5d7 Mon Sep 17 00:00:00 2001 +From: Madelyn Olson +Date: Thu, 29 May 2025 00:06:23 +0100 +Subject: [PATCH] Incorporate Redis CVE for CVE-2025-27151 (#2146) + +Resolves https://github.com/valkey-io/valkey/issues/2145 + +Incorporate the CVE patch that was sent to us by Redis Ltd. + +--------- + +Signed-off-by: Madelyn Olson +Co-authored-by: Ping Xie +--- + src/valkey-check-aof.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/valkey-check-aof.c b/src/valkey-check-aof.c +index ed0eb2b49d..a6e4b97c6d 100644 +--- a/src/valkey-check-aof.c ++++ b/src/valkey-check-aof.c +@@ -556,6 +556,12 @@ int redis_check_aof_main(int argc, char **argv) { + goto invalid_args; + } + ++ /* Check if filepath is longer than PATH_MAX */ ++ if (strnlen(filepath, PATH_MAX + 1) > PATH_MAX) { ++ printf("Error: filepath is too long (exceeds PATH_MAX)\n"); ++ goto invalid_args; ++ } ++ + /* In the glibc implementation dirname may modify their argument. */ + memcpy(temp_filepath, filepath, strlen(filepath) + 1); + dirpath = dirname(temp_filepath); diff --git a/valkey.spec b/valkey.spec index dee02b1..b540365 100644 --- a/valkey.spec +++ b/valkey.spec @@ -4,13 +4,13 @@ %else %bcond_with docs %endif -%global doc_version 8.0.2 +%global doc_version 8.0.3 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 8.0.3 -Release: 3%{?dist} +Version: 8.0.4 +Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -29,6 +29,7 @@ Source9: migrate_redis_to_valkey.sh Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz Patch0: 0001-valkey-cve-2025-49112.patch +Patch1: valkey-cve-2025-27151.patch BuildRequires: make BuildRequires: gcc @@ -159,7 +160,8 @@ Provides: redis-doc = %{version}-%{release} # no autosetup due to no support for multiple source extraction %setup -n %{name}-%{version} -a50 -%patch 0 -p1 +%patch -P0 -p1 +%patch -P1 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc @@ -404,6 +406,10 @@ fi %changelog +* Wed Jul 16 2025 Remi Collet - 8.0.4-1 +- update to 8.0.4 + fixes CVE-2025-27151 CVE-2025-48367 and CVE-2025-32023 + * Fri Jun 06 2025 Jonathan Wright - 8.0.3-3 - Apply patch for CVE-2025-49112 properly From ff7dfbd9774d2cd2b1df9e6dd1e4679e90403214 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 4 Oct 2025 08:12:41 +0200 Subject: [PATCH 6/6] update to 8.0.6 fixes CVE-2025-49844 CVE-2025-46817 CVE-2025-46818 and CVE-2025-46819 update documentation to 8.0.5 (cherry picked from commit 139a204bfb5e05bcec97f43cb7b50210dcc1c212) --- .gitignore | 2 ++ 0001-valkey-cve-2025-49112.patch | 23 ----------------------- sources | 4 ++-- valkey.spec | 11 +++++++---- 4 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 0001-valkey-cve-2025-49112.patch diff --git a/.gitignore b/.gitignore index c84f339..48de5de 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /valkey-8.0.3.tar.gz /valkey-8.0.4.tar.gz /valkey-doc-8.0.3.tar.gz +/valkey-8.0.6.tar.gz +/valkey-doc-8.0.5.tar.gz diff --git a/0001-valkey-cve-2025-49112.patch b/0001-valkey-cve-2025-49112.patch deleted file mode 100644 index fcb8b15..0000000 --- a/0001-valkey-cve-2025-49112.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0b8147ca27d2d06efadf37f0f064f19607e7e1f8 Mon Sep 17 00:00:00 2001 -From: Zeroday BYTE -Date: Tue, 20 May 2025 00:59:10 +0700 -Subject: [PATCH] Update networking.c - -Signed-off-by: Zeroday BYTE ---- - src/networking.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/networking.c b/src/networking.c -index 5f57050971..78b62d0c59 100644 ---- a/src/networking.c -+++ b/src/networking.c -@@ -883,7 +883,7 @@ void setDeferredReply(client *c, void *node, const char *s, size_t length) { - * - It has enough room already allocated - * - And not too large (avoid large memmove) - * - And the client is not in a pending I/O state */ -- if (ln->prev != NULL && (prev = listNodeValue(ln->prev)) && prev->size - prev->used > 0 && -+ if (ln->prev != NULL && (prev = listNodeValue(ln->prev)) && prev->used < prev->size && - c->io_write_state != CLIENT_PENDING_IO) { - size_t len_to_copy = prev->size - prev->used; - if (len_to_copy > length) len_to_copy = length; diff --git a/sources b/sources index 470e536..a962adc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-8.0.4.tar.gz) = 2e6969a2c791f39943fe31c9c6dc5432accc37212c586f891f997df6dc74c0329d9f7254c54842f8203c8427f903e016cd465747d221349396327649ffa340fb -SHA512 (valkey-doc-8.0.3.tar.gz) = 7a44a6abc353d2a3af814ad7d243a59e6543d3af66f4aba07085eedc86ec7ced19af74993752285c31c7238d54d36392603afcb987c6618ea55ec0ca08322b45 +SHA512 (valkey-8.0.6.tar.gz) = 0f704ad06abab2817657abe60be6fb7c45df91cdaaa53d921e26c6f4e91a3712152a31550b876d8deba3493a6ca4b87194efd3a86cacd53906f01e845e7cb137 +SHA512 (valkey-doc-8.0.5.tar.gz) = 9cb90db9fcbed42dcf07b45b5493d0b72779d504c4eb18d8ebe2dc13b46aa35aff5be46e02aec74574b101f8ac0aa532abf6be26acc0a0954e3015f950a21049 diff --git a/valkey.spec b/valkey.spec index b540365..407ab71 100644 --- a/valkey.spec +++ b/valkey.spec @@ -4,12 +4,12 @@ %else %bcond_with docs %endif -%global doc_version 8.0.3 +%global doc_version 8.0.5 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 8.0.4 +Version: 8.0.6 Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause @@ -28,7 +28,6 @@ Source8: macros.%{name} Source9: migrate_redis_to_valkey.sh Source50: https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz -Patch0: 0001-valkey-cve-2025-49112.patch Patch1: valkey-cve-2025-27151.patch BuildRequires: make @@ -160,7 +159,6 @@ Provides: redis-doc = %{version}-%{release} # no autosetup due to no support for multiple source extraction %setup -n %{name}-%{version} -a50 -%patch -P0 -p1 %patch -P1 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua @@ -406,6 +404,11 @@ fi %changelog +* Sat Oct 4 2025 Remi Collet - 8.0.6-1 +- update to 8.0.6 + fixes CVE-2025-49844 CVE-2025-46817 CVE-2025-46818 and CVE-2025-46819 +- update documentation to 8.0.5 + * Wed Jul 16 2025 Remi Collet - 8.0.4-1 - update to 8.0.4 fixes CVE-2025-27151 CVE-2025-48367 and CVE-2025-32023