diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-10 13:02:42 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-10 13:02:42 +0000 |
commit | 8c8f1cfd2aa9e839aad7dad6fd43b370cfbc0a1e (patch) | |
tree | f7b0f94c13a0454ed75b614028f1455e894f28d2 /dev-db/redis/files | |
parent | 47f05d092ef8c19b3e973f62648e58c0e1a18631 (diff) |
gentoo auto-resync : 10:01:2024 - 13:02:42
Diffstat (limited to 'dev-db/redis/files')
-rw-r--r-- | dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch | 61 | ||||
-rw-r--r-- | dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch | 173 |
2 files changed, 0 insertions, 234 deletions
diff --git a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch deleted file mode 100644 index 55da00137b46..000000000000 --- a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e7144693e2446f21ee68c95676ecf65d1351d13e Mon Sep 17 00:00:00 2001 -From: Binbin <binloveplay1314@qq.com> -Date: Wed, 27 Jul 2022 19:58:25 +0800 -Subject: [PATCH] Fix bgsaveerr issue in psync wrong offset test (#11043) - -The kill above is sometimes successful and sometimes already too late. -The PING in pysnc wrong offset test got rejected by bgsaveerr because -lastbgsave_status is C_ERR. - -In theory, using diskless can avoid PING being affected, because when -the replica is dropped, we will kill the child with SIGUSR1, and this -will not affect lastbgsave_status. - -Anyway, this kill is not particularly needed here, dropping the kill -is the best one, since we do have the waitForBgsave, so just let it -take care of the bgsave. No need for fast termination. ---- - -This patch is backported from upstream, see PR #11043. - -Upstream-PR: https://github.com/redis/redis/pull/11043 - -diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl -index d60c91918..457c3150e 100644 ---- a/tests/integration/replication.tcl -+++ b/tests/integration/replication.tcl -@@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} { - verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines - - $rd close -- catch {exec kill -9 [get_child_pid 0]} - waitForBgsave r - } - -@@ -1307,7 +1306,6 @@ start_server {tags {"repl" "external:skip"}} { - verify_log_message 0 "*Replica generated a reply to command 'xinfo|help', disconnecting it: *" $lines - - $rd close -- catch {exec kill -9 [get_child_pid 0]} - waitForBgsave r - } - -@@ -1328,7 +1326,6 @@ start_server {tags {"repl" "external:skip"}} { - verify_log_message 0 "*Replica can't interact with the keyspace*" $lines - - $rd close -- catch {exec kill -9 [get_child_pid 0]} - waitForBgsave r - } - -@@ -1347,7 +1344,6 @@ start_server {tags {"repl" "external:skip"}} { - verify_log_message 0 "*Replica generated a reply to command 'slowlog|get', disconnecting it: *" $lines - - $rd close -- catch {exec kill -9 [get_child_pid 0]} - waitForBgsave r - } - --- -2.35.1 - diff --git a/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch b/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch deleted file mode 100644 index 8f5eaff13fed..000000000000 --- a/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch +++ /dev/null @@ -1,173 +0,0 @@ -This is the patch recommended to apply in order to fix CVE-2022-3647. - -Upstream-commit: https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3 -Bug: https://bugs.gentoo.org/877863 - -diff --git a/src/debug.c b/src/debug.c -index 8cc811be4..b15ac8780 100644 ---- a/src/debug.c -+++ b/src/debug.c -@@ -1123,73 +1123,88 @@ void bugReportStart(void) { - } - - #ifdef HAVE_BACKTRACE --static void *getMcontextEip(ucontext_t *uc) { -+ -+/* Returns the current eip and set it to the given new value (if its not NULL) */ -+static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { - #define NOT_SUPPORTED() do {\ - UNUSED(uc);\ -+ UNUSED(eip);\ - return NULL;\ - } while(0) -+#define GET_SET_RETURN(target_var, new_val) do {\ -+ void *old_val = (void*)target_var; \ -+ if (new_val) { \ -+ void **temp = (void**)&target_var; \ -+ *temp = new_val; \ -+ } \ -+ return old_val; \ -+} while(0) - #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) - /* OSX < 10.6 */ - #if defined(__x86_64__) -- return (void*) uc->uc_mcontext->__ss.__rip; -+ GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip); - #elif defined(__i386__) -- return (void*) uc->uc_mcontext->__ss.__eip; -+ GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip); - #else -- return (void*) uc->uc_mcontext->__ss.__srr0; -+ GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip); - #endif - #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) - /* OSX >= 10.6 */ - #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__) -- return (void*) uc->uc_mcontext->__ss.__rip; -+ GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip); - #elif defined(__i386__) -- return (void*) uc->uc_mcontext->__ss.__eip; -+ GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip); - #else - /* OSX ARM64 */ -- return (void*) arm_thread_state64_get_pc(uc->uc_mcontext->__ss); -+ void *old_val = (void*)arm_thread_state64_get_pc(uc->uc_mcontext->__ss); -+ if (eip) { -+ arm_thread_state64_set_pc_fptr(uc->uc_mcontext->__ss, eip); -+ } -+ return old_val; - #endif - #elif defined(__linux__) - /* Linux */ - #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) -- return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */ -+ GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); - #elif defined(__X86_64__) || defined(__x86_64__) -- return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */ -+ GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); - #elif defined(__ia64__) /* Linux IA64 */ -- return (void*) uc->uc_mcontext.sc_ip; -+ GET_SET_RETURN(uc->uc_mcontext.sc_ip, eip); - #elif defined(__arm__) /* Linux ARM */ -- return (void*) uc->uc_mcontext.arm_pc; -+ GET_SET_RETURN(uc->uc_mcontext.arm_pc, eip); - #elif defined(__aarch64__) /* Linux AArch64 */ -- return (void*) uc->uc_mcontext.pc; -+ GET_SET_RETURN(uc->uc_mcontext.pc, eip); - #else - NOT_SUPPORTED(); - #endif - #elif defined(__FreeBSD__) - /* FreeBSD */ - #if defined(__i386__) -- return (void*) uc->uc_mcontext.mc_eip; -+ GET_SET_RETURN(uc->uc_mcontext.mc_eip, eip); - #elif defined(__x86_64__) -- return (void*) uc->uc_mcontext.mc_rip; -+ GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip); - #else - NOT_SUPPORTED(); - #endif - #elif defined(__OpenBSD__) - /* OpenBSD */ - #if defined(__i386__) -- return (void*) uc->sc_eip; -+ GET_SET_RETURN(uc->sc_eip, eip); - #elif defined(__x86_64__) -- return (void*) uc->sc_rip; -+ GET_SET_RETURN(uc->sc_rip, eip); - #else - NOT_SUPPORTED(); - #endif - #elif defined(__NetBSD__) - #if defined(__i386__) -- return (void*) uc->uc_mcontext.__gregs[_REG_EIP]; -+ GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_EIP], eip); - #elif defined(__x86_64__) -- return (void*) uc->uc_mcontext.__gregs[_REG_RIP]; -+ GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_RIP], eip); - #else - NOT_SUPPORTED(); - #endif - #elif defined(__DragonFly__) -- return (void*) uc->uc_mcontext.mc_rip; -+ GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip); - #else - NOT_SUPPORTED(); - #endif -@@ -1951,6 +1966,10 @@ void dumpCodeAroundEIP(void *eip) { - } - } - -+void invalidFunctionWasCalled() {} -+ -+typedef void (*invalidFunctionWasCalledType)(); -+ - void sigsegvHandler(int sig, siginfo_t *info, void *secret) { - UNUSED(secret); - UNUSED(info); -@@ -1968,13 +1987,30 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) { - - #ifdef HAVE_BACKTRACE - ucontext_t *uc = (ucontext_t*) secret; -- void *eip = getMcontextEip(uc); -+ void *eip = getAndSetMcontextEip(uc, NULL); - if (eip != NULL) { - serverLog(LL_WARNING, - "Crashed running the instruction at: %p", eip); - } - -- logStackTrace(getMcontextEip(uc), 1); -+ if (eip == info->si_addr) { -+ /* When eip matches the bad address, it's an indication that we crashed when calling a non-mapped -+ * function pointer. In that case the call to backtrace will crash trying to access that address and we -+ * won't get a crash report logged. Set it to a valid point to avoid that crash. */ -+ -+ /* This trick allow to avoid compiler warning */ -+ void *ptr; -+ invalidFunctionWasCalledType *ptr_ptr = (invalidFunctionWasCalledType*)&ptr; -+ *ptr_ptr = invalidFunctionWasCalled; -+ getAndSetMcontextEip(uc, ptr); -+ } -+ -+ logStackTrace(eip, 1); -+ -+ if (eip == info->si_addr) { -+ /* Restore old eip */ -+ getAndSetMcontextEip(uc, eip); -+ } - - logRegisters(uc); - #endif -@@ -2079,7 +2115,7 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) { - - serverLogFromHandler(LL_WARNING,"\n--- WATCHDOG TIMER EXPIRED ---"); - #ifdef HAVE_BACKTRACE -- logStackTrace(getMcontextEip(uc), 1); -+ logStackTrace(getAndSetMcontextEip(uc, NULL), 1); - #else - serverLogFromHandler(LL_WARNING,"Sorry: no support for backtrace()."); - #endif --- -2.37.4 - |