jengelh/glusterfs
SHA256
1
0
Fork 0
forked from pool/glusterfs
Code Pull Requests Activity

Accepting request 1098829 from filesystems

Browse Source 
- Add 0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch

OBS-URL: https://build.opensuse.org/request/show/1098829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=37
This commit is contained in:
Ana Guerrero 2023-07-17 17:22:54 +00:00 committed by Git OBS Bridge
commit ca863f333c
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch Normal file
View File

@ -0,0 +1,44 @@
From 5d0533d0858194ed6d365f1080db7ab10d0e3d11 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 5 Jul 2023 18:15:22 +0900
Subject: [PATCH] glusterfs: fix heap-buffer-overflow on startup
References: https://github.com/gluster/glusterfs/issues/4192
==4418==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x613000000190
at pc 0x7f028cd2341c bp 0x7ffd9c5ba7e0 sp 0x7ffd9c5ba7d8
WRITE of size 8 at 0x613000000190 thread T0
f0 in mem_get_pool_list ~/libglusterfs/src/mem-pool.c:786
0x613000000190 is located 0 bytes after 336-byte region [0x613000000040,0x613000000190)
allocated by thread T0 here:
f0 in malloc (/usr/lib64/libasan.so.8+0xdc04f) (BuildId: 44194dcf14c212b57346030492309d59d5379ae1)
f1 in __gf_default_malloc glusterfs/mem-pool.h:112
f2 in mem_get_pool_list ~/libglusterfs/src/mem-pool.c:778
``NPOOLS-1`` is just wrong. ``per_thread_pool_list_t`` does not include one free
``per_thread_pool_t``.
Fixes: https://github.com/gluster/glusterfs/issues/4192
Fixes: v11dev-211-g1cfff6e6ec ("Use flexible array members (#3411)")
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
libglusterfs/src/mem-pool.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index f053fdceae..e258758158 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -589,8 +589,7 @@ mem_pools_preinit(void)
}
pool_list_size = sizeof(per_thread_pool_list_t) +
- sizeof(per_thread_pool_t) * (NPOOLS - 1);
-
+ sizeof(per_thread_pool_t) * NPOOLS;
init_done = GF_MEMPOOL_INIT_EARLY;
}
--
2.41.0

5
glusterfs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 5 09:28:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
-------------------------------------------------------------------
Sat Jun 10 13:29:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

2
glusterfs.spec
View File

@ -28,6 +28,7 @@ URL: https://www.gluster.org/
#Git-Clone: https://github.com/fvzwieten/lsgvt
Source: https://download.gluster.org/pub/gluster/glusterfs/11/%version/glusterfs-%version.tar.gz
Patch1: 0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
Patch2: 0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
@ -150,7 +151,6 @@ links.
%build
%define _lto_cflags %nil
./autogen.sh
# https://github.com/gluster/glusterfs/issues/3947
%configure \
--without-tcmalloc \
--disable-linux-io_uring \