mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-21 05:57:05 +00:00
Code Issues Projects Releases Wiki Activity

redis: 7.0.5 -> 7.0.7

Browse Source 
This upgrade include fix for CVE-2022-3647

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2023-01-05 08:52:17 +08:00
committed by Khem Raj
parent 097b1a7e7c
commit d869383b0f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/redis/redis-7/0006-Define-correct-gregs-for-RISCV32.patch
+11 -9
View File
@@ -1,4 +1,4 @@
From f26a978c638bcbc621669dce0ab89e43af42af98 Mon Sep 17 00:00:00 2001 From b6b2c652abfa98093401b232baca8719c50cadf4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 26 Oct 2020 21:32:22 -0700 Date: Mon, 26 Oct 2020 21:32:22 -0700
Subject: [PATCH] Define correct gregs for RISCV32 Subject: [PATCH] Define correct gregs for RISCV32
@@ -6,18 +6,17 @@ Subject: [PATCH] Define correct gregs for RISCV32
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Updated patch for 6.2.1 Updated patch for 6.2.8
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
src/debug.c | 26 ++++++++++++++++++++++++-- src/debug.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-) 1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/debug.c b/src/debug.c diff --git a/src/debug.c b/src/debug.c
index 2da2c5d..1d778fa 100644 index ebda858..90bc450 100644
--- a/src/debug.c --- a/src/debug.c
+++ b/src/debug.c +++ b/src/debug.c
@@ -1116,7 +1116,9 @@ static void *getMcontextEip(ucontext_t *uc) { @@ -1168,7 +1168,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
#endif #endif
#elif defined(__linux__) #elif defined(__linux__)
/* Linux */ /* Linux */
@@ -25,10 +24,10 @@ index 2da2c5d..1d778fa 100644
+ #if defined(__riscv) && __riscv_xlen == 32 + #if defined(__riscv) && __riscv_xlen == 32
+ return (void*) uc->uc_mcontext.__gregs[REG_PC]; + return (void*) uc->uc_mcontext.__gregs[REG_PC];
+ #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) + #elif 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__) #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);
@@ -1298,8 +1300,28 @@ void logRegisters(ucontext_t *uc) { @@ -1350,8 +1352,28 @@ void logRegisters(ucontext_t *uc) {
#endif #endif
/* Linux */ /* Linux */
#elif defined(__linux__) #elif defined(__linux__)
@@ -58,3 +57,6 @@ index 2da2c5d..1d778fa 100644
serverLog(LL_WARNING, serverLog(LL_WARNING,
"\n" "\n"
"EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
--
2.25.1
meta-oe/recipes-extended/redis/redis_7.0.5.bb → meta-oe/recipes-extended/redis/redis_7.0.7.bb
+1 -1
View File
@@ -19,7 +19,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
file://GNU_SOURCE-7.patch \ file://GNU_SOURCE-7.patch \
file://0006-Define-correct-gregs-for-RISCV32.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \
" "
SRC_URI[sha256sum] = "67054cc37b58c125df93bd78000261ec0ef4436a26b40f38262c780e56315cc3" SRC_URI[sha256sum] = "8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586"
inherit autotools-brokensep update-rc.d systemd useradd inherit autotools-brokensep update-rc.d systemd useradd