diff options
| author | Jan Pavlinec <jan.pavlinec@nic.cz> | 2021-03-01 12:26:14 +0100 |
|---|---|---|
| committer | Jan Pavlinec <jan.pavlinec@nic.cz> | 2021-03-01 14:14:58 +0100 |
| commit | 4e0962e8f484fa64381f9b12f176e66bb8723ded (patch) | |
| tree | e9705b214c6a722eb9fa1f4a3bd8f9b560ddd2f8 /libs/redis/patches | |
| parent | bfc0b44b474fd7fbe7050f37b19c070170fcca06 (diff) | |
redis: update to version 6.2.0
Fixes CVE-2021-21309
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Diffstat (limited to 'libs/redis/patches')
| -rw-r--r-- | libs/redis/patches/020-fix-atomicvar.patch | 20 | ||||
| -rw-r--r-- | libs/redis/patches/030-fix-size_t-zmalloc.patch | 43 |
2 files changed, 53 insertions, 10 deletions
diff --git a/libs/redis/patches/020-fix-atomicvar.patch b/libs/redis/patches/020-fix-atomicvar.patch index 01c18eab2..bf98b0e56 100644 --- a/libs/redis/patches/020-fix-atomicvar.patch +++ b/libs/redis/patches/020-fix-atomicvar.patch @@ -1,16 +1,16 @@ --- a/src/atomicvar.h +++ b/src/atomicvar.h -@@ -68,7 +68,7 @@ - * is reported. */ - // #define __ATOMIC_VAR_FORCE_SYNC_MACROS +@@ -81,7 +81,7 @@ + #define ANNOTATE_HAPPENS_AFTER(v) ((void) v) + #endif --#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) -+#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) - /* Implementation using __atomic macros. */ - - #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) -@@ -82,7 +82,7 @@ - #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) +-#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ ++#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ + (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__) + /* Use '_Atomic' keyword if the compiler supports. */ + #undef redisAtomic +@@ -126,7 +126,7 @@ + __atomic_store_n(&var,value,__ATOMIC_SEQ_CST) #define REDIS_ATOMIC_API "atomic-builtin" -#elif defined(HAVE_ATOMIC) diff --git a/libs/redis/patches/030-fix-size_t-zmalloc.patch b/libs/redis/patches/030-fix-size_t-zmalloc.patch new file mode 100644 index 000000000..a0bfacb8f --- /dev/null +++ b/libs/redis/patches/030-fix-size_t-zmalloc.patch @@ -0,0 +1,43 @@ +From dd885780d67f18f356a5652ab6d4f947ee035305 Mon Sep 17 00:00:00 2001 +From: Yossi Gottlieb <yossigo@gmail.com> +Date: Tue, 23 Feb 2021 17:08:49 +0200 +Subject: [PATCH] Fix compile errors with no HAVE_MALLOC_SIZE. (#8533) + +Also adds a new daily CI test, relying on the fact that we don't use malloc_size() on alpine libmusl. + +Fixes #8531 +--- + .github/workflows/daily.yml | 22 +++++++++++++++++++++- + src/zmalloc.c | 7 ++----- + 2 files changed, 23 insertions(+), 6 deletions(-) + +--- a/src/zmalloc.c ++++ b/src/zmalloc.c +@@ -32,6 +32,7 @@ + #include <stdlib.h> + #include <stdint.h> + #include <unistd.h> ++#include <assert.h> + + /* This function provide us access to the original libc free(). This is useful + * for instance to free results obtained by backtrace_symbols(). We need +@@ -49,18 +50,14 @@ void zlibc_free(void *ptr) { + + #ifdef HAVE_MALLOC_SIZE + #define PREFIX_SIZE (0) ++#define ASSERT_NO_SIZE_OVERFLOW(sz) + #else + #if defined(__sun) || defined(__sparc) || defined(__sparc__) + #define PREFIX_SIZE (sizeof(long long)) + #else + #define PREFIX_SIZE (sizeof(size_t)) + #endif +-#endif +- +-#if PREFIX_SIZE > 0 + #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz)) +-#else +-#define ASSERT_NO_SIZE_OVERFLOW(sz) + #endif + + /* Explicitly override malloc/free etc when using tcmalloc. */ |