From a2f41c7df0986cc7a79a5b6ffcd70ffb78e6e105 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 15:24:22 +0200 Subject: Merging debian version 1:10.11.8-1. Signed-off-by: Daniel Baumann --- debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch') diff --git a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch index bbc1af6b..b6dd97e3 100644 --- a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch +++ b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch @@ -1,6 +1,4 @@ -Forwarded: https://github.com/MariaDB/server/pull/2541 -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2541.patch -Bug: https://jira.mariadb.org/browse/MDEV-31151 +From fd83a9431cd16e6c61b8cdbb89810c554a315338 Mon Sep 17 00:00:00 2001 From: Hugo Wen Date: Sat, 11 Mar 2023 00:27:42 +0000 Subject: [PATCH] Fix a stack overflow in pinbox allocator @@ -126,7 +124,7 @@ Services, Inc. { for (i= 0; i < LF_PINBOX_PINS; i++) { - void *p= el->pin[i]; + void *p= my_atomic_loadptr((void **)&el->pin[i]); if (p) - *hv->granary++= p; + { @@ -172,7 +170,7 @@ Services, Inc. - LF_PINS *el_end= el+LF_DYNARRAY_LEVEL_LENGTH; - for (; el < el_end; el++) - for (i= 0; i < LF_PINBOX_PINS; i++) -- if (el->pin[i] == addr) +- if (my_atomic_loadptr((void **)&el->pin[i]) == addr) - return 1; - return 0; -} -- cgit v1.2.3