mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-12 00:07:12 +03:00
d4fb521d82
glibc-2.42 added __inet_ntop_chk fortification, which started to fail: *** buffer overflow detected ***: terminated Program received signal SIGABRT, Aborted. 0x00007ffff629b0dc in __pthread_kill_implementation () from /lib64/libc.so.6 (gdb) bt #0 in __pthread_kill_implementation () from /lib64/libc.so.6 #1 in raise () from /lib64/libc.so.6 #2 in abort () from /lib64/libc.so.6 #3 in __libc_message_impl.cold () from /lib64/libc.so.6 #4 in __fortify_fail () from /lib64/libc.so.6 #5 in __chk_fail () from /lib64/libc.so.6 #6 in __inet_ntop_chk () from /lib64/libc.so.6 #7 in inet_ntop (..) at /usr/include/bits/inet-fortified.h> #8 ipv6tuple_to_string[abi:cxx11](ipv6tuple*, bool) (..) Use INET6_ADDRSTRLEN as destination buffer size. Also add a minor build system fix and ebuild cleanups. Revbump directly to stable since this has always been an issue and should be fixed even with glibc <2.42. Closes: https://bugs.gentoo.org/961046 Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/43311 Signed-off-by: Sam James <sam@gentoo.org>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
Patch from:
|
|
https://github.com/falcosecurity/libs/commit/de3f4cac9233682eae63c63377c82efb649679f5
|
|
|
|
From de3f4cac9233682eae63c63377c82efb649679f5 Mon Sep 17 00:00:00 2001
|
|
From: Shane Lawrence <shane@lawrence.dev>
|
|
Date: Thu, 20 Feb 2025 14:55:41 +0000
|
|
Subject: [PATCH] Fix buffer overrun reading sockets from procfs.
|
|
|
|
Signed-off-by: Shane Lawrence <shane@lawrence.dev>
|
|
---
|
|
userspace/libscap/linux/scap_fds.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/userspace/libscap/linux/scap_fds.c b/userspace/libscap/linux/scap_fds.c
|
|
index f98ac3f32f..73e99ca428 100644
|
|
--- a/userspace/libscap/linux/scap_fds.c
|
|
+++ b/userspace/libscap/linux/scap_fds.c
|
|
@@ -766,7 +766,7 @@ int32_t scap_fd_read_ipv4_sockets_from_proc_fs(const char *dir,
|
|
break;
|
|
}
|
|
|
|
- while(*scan_pos == ' ' && scan_pos < scan_end) {
|
|
+ while(scan_pos < scan_end && *scan_pos == ' ') {
|
|
scan_pos++;
|
|
}
|
|
|
|
@@ -974,7 +974,7 @@ int32_t scap_fd_read_ipv6_sockets_from_proc_fs(char *dir,
|
|
break;
|
|
}
|
|
|
|
- while(*scan_pos == ' ' && scan_pos < scan_end) {
|
|
+ while(scan_pos < scan_end && *scan_pos == ' ') {
|
|
scan_pos++;
|
|
}
|
|
|