- devel - example.com

[PATCH] fix possible overflow in pointer arithmetics strnlen()
by Marcus Haehnel 08 Jan '25

08 Jan '25

From: Frank Mehnert <frank.mehnert(a)kernkonzept.com> It is undefined behavior to compare two pointers belonging to different objects. This includes the case where the addition overflows. Clang-20 seems to follow this rule more eagerly and optimizes away the old test. Fix the test by performing the addition on uintptr_t values rather than on on char pointers. See also https://github.com/llvm/llvm-project/issues/121909. Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- libc/string/generic/strnlen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c index 4d4cde84f..82d4122ec 100644 --- a/libc/string/generic/strnlen.c +++ b/libc/string/generic/strnlen.c @@ -29,15 +29,17 @@ '\0' terminator is found in that many characters, return MAXLEN. */ size_t strnlen (const char *str, size_t maxlen) { - const char *char_ptr, *end_ptr = str + maxlen; + const char *char_ptr, *end_ptr; const unsigned long int *longword_ptr; unsigned long int longword, himagic, lomagic; if (maxlen == 0) return 0; - if (__builtin_expect (end_ptr < str, 0)) + if (__builtin_expect ((uintptr_t)str + maxlen < (uintptr_t)str, 0)) end_ptr = (const char *) ~0UL; + else + end_ptr = str + maxlen; /* Handle the first few characters by reading one character at a time. Do this until CHAR_PTR is aligned on a longword boundary. */ -- 2.47.1

3 15

[PATCH] prevent warning about setting an unused variable
by Marcus Haehnel 07 Jan '25

07 Jan '25

From: Frank Mehnert <frank.mehnert(a)kernkonzept.com> Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- libc/misc/internals/reloc_static_pie.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libc/misc/internals/reloc_static_pie.c b/libc/misc/internals/reloc_static_pie.c index cb2c4df87..3bbdef18e 100644 --- a/libc/misc/internals/reloc_static_pie.c +++ b/libc/misc/internals/reloc_static_pie.c @@ -107,6 +107,8 @@ reloc_static_pie(ElfW(Addr) load_addr) PERFORM_BOOTSTRAP_RELOC(rpnt, reloc_addr, symbol_addr, load_addr, sym); } } +#else + (void)rel_size; #endif } _dl_load_base = load_addr; -- 2.47.1

1 0

[PATCH] uclibc: prevent warning about declaring an unused function
by Marcus Haehnel 06 Jan '25

06 Jan '25

From: Frank Mehnert <frank.mehnert(a)kernkonzept.com> Signed-off-by: Marcus Haehnel <marcus.haehnel(a)kernkonzept.com> --- libc/stdlib/stdlib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index f5936630c..c45dd53a5 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -822,6 +822,7 @@ libc_hidden_def(_stdlib_mb_cur_max) #endif +#if defined(L_mblen) || defined(L_mbtowc) || defined(L_wctomb) #ifdef __UCLIBC_HAS_LOCALE__ /* * The following function return 1 if the encoding is stateful, 0 if stateless. @@ -844,6 +845,7 @@ static __always_inline int is_stateful(unsigned char encoding) #else #define is_stateful(encoding) 0 #endif +#endif /**********************************************************************/ #ifdef L_mblen -- 2.47.1

1 0

[PATCH] time.h: Change type of `tv_sec` in `timespec` to `int` from `_time_t`.
by Nadav Tasher 22 Dec '24

22 Dec '24

Without this change `timespec` is too large for the `clock_nanosleep` syscall, which translates to sleep(0) on 32bit systems when TIME64 is enabled (the default). Tested on MIPS. Signed-off-by: Nadav Tasher <tashernadav(a)gmail.com> --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 1a1408990..25dfb9e2e 100644 --- a/include/time.h +++ b/include/time.h @@ -118,7 +118,7 @@ typedef __timer_t timer_t; has nanoseconds instead of microseconds. */ struct timespec { - __time_t tv_sec; /* Seconds. */ + int tv_sec; /* Seconds. */ long int tv_nsec; /* Nanoseconds. */ }; -- 2.34.1

3 7

TLS memory-leak with dlopen
by Lumingxiang 31 Oct '24

31 Oct '24

If a shared library (so) is loaded using dlopen and utilizes thread-local storage (TLS), the memory will not be freed upon thread exit, resulting in a memory leak. This issue has been resolved in glibc-2.14. However, it remains unresolved in uClibc. The following patch is based on the patch made in glibc and has been validated as effective on the x86-64 architecture. diff --git a/libpthread/nptl/allocatestack.c b/libpthread/nptl/allocatestack.c index 7ef884543..941ef22f0 100644 --- a/libpthread/nptl/allocatestack.c +++ b/libpthread/nptl/allocatestack.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <sys/mman.h> #include <sys/param.h> +#include <dl-tls.h> #include <tls.h> #include <lowlevellock.h> #include <link.h> @@ -241,6 +242,10 @@ get_cached_stack (size_t *sizep, void **memp) /* Clear the DTV. */ dtv_t *dtv = GET_DTV (TLS_TPADJ (result)); + for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt) + if (! dtv[1 + cnt].pointer.is_static + && dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED) + free (dtv[1 + cnt].pointer.val); memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t)); /* Re-initialize the TLS. */ diff --git a/libpthread/nptl/sysdeps/generic/dl-tls.c b/libpthread/nptl/sysdeps/generic/dl-tls.c index 7d25e4706..7b7991be8 100644 --- a/libpthread/nptl/sysdeps/generic/dl-tls.c +++ b/libpthread/nptl/sysdeps/generic/dl-tls.c @@ -45,8 +45,6 @@ to allow dynamic loading of modules defining IE-model TLS data. */ # define TLS_STATIC_SURPLUS 64 + DL_NNS * 100 -/* Value used for dtv entries for which the allocation is delayed. */ -# define TLS_DTV_UNALLOCATED ((void *) -1l) #ifndef SHARED extern dtv_t static_dtv; diff --git a/libpthread/nptl/sysdeps/x86_64/dl-tls.h b/libpthread/nptl/sysdeps/x86_64/dl-tls.h index d6c338cda..5cac55f33 100644 --- a/libpthread/nptl/sysdeps/x86_64/dl-tls.h +++ b/libpthread/nptl/sysdeps/x86_64/dl-tls.h @@ -26,3 +26,6 @@ typedef struct extern void *__tls_get_addr (tls_index *ti); + +/* Value used for dtv entries for which the allocation is delayed. */ +#define TLS_DTV_UNALLOCATED ((void *) -1l) Ref: https://sourceware.org/bugzilla/show_bug.cgi?id=12650 How to reproduce: ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 10

[PATCH v2 1/2] mips64n32, time64: Select correct _dl_fstat impl
by Dmitry Chestnykh 10 Sep '24

10 Sep '24

With time64 enabled we have to use statx() instead of stat() or fstat() If the _dl_fstat implementation isn't selected correctly we can have multiple errors inside dynamic linker during startup of the system and of the almost every process Add sparc exclusion like in other places inside this header Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 180d03012..c143b8d45 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -168,7 +168,7 @@ static __always_inline int _dl_stat(const char *file_name, #if defined __NR_fstat64 && !defined __NR_fstat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_fstat __NR_fstat64 static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) -#elif defined __NR_fstat +#elif defined __NR_fstat && !defined __UCLIBC_USE_TIME64__ || defined(__sparc__) # define __NR__dl_fstat __NR_fstat static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) #elif defined __NR_statx && defined __UCLIBC_HAVE_STATX__ -- 2.46.0

2 2

[PATCH] NFC: Don't put function def inside function def
by Dmitry Chestnykh 09 Sep '24

09 Sep '24

clang rejects the code where function body is placed inside body of another function Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/common/rename.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libc/sysdeps/linux/common/rename.c b/libc/sysdeps/linux/common/rename.c index 613ae4e44..821467e3c 100644 --- a/libc/sysdeps/linux/common/rename.c +++ b/libc/sysdeps/linux/common/rename.c @@ -18,10 +18,12 @@ int rename(const char *oldpath, const char *newpath) } #elif defined __NR_renameat2 # include <fcntl.h> + +_syscall5(int, renameat2, int, olddfd, const char *, oldpath, + int, newdfd, const char *, newpath, int, flags) + int rename(const char *oldpath, const char *newpath) { - _syscall5(int, renameat2, int, olddfd, const char *, oldpath, - int, newdfd, const char *, newpath, int, flags) return renameat2(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0); } #else -- 2.46.0

2 1

[PATCH 1/2] mips64n32, time64: Select correct _dl_fstat impl
by Dmitry Chestnykh 03 Sep '24

03 Sep '24

With time64 enabled we have to use statx() instead of stat() or fstat() If the _dl_fstat implementation isn't selected correctly we can have multiple errors inside dynamic linker during startup of the system and of the almost every process Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 180d03012..4b0d0f395 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -168,7 +168,7 @@ static __always_inline int _dl_stat(const char *file_name, #if defined __NR_fstat64 && !defined __NR_fstat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_fstat __NR_fstat64 static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) -#elif defined __NR_fstat +#elif defined __NR_fstat && !defined __UCLIBC_USE_TIME64__ # define __NR__dl_fstat __NR_fstat static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) #elif defined __NR_statx && defined __UCLIBC_HAVE_STATX__ -- 2.46.0

1 1

new release 1.0.50
by Waldemar Brodkorb 13 Aug '24

13 Aug '24

Hi uClibc-ng hackers, I released 1.0.50 today. See his git shortlog for changes: Dmitry Chestnykh (2): Fix compilation with 4.x kernel headers Group conditions after `&&` Frank Mehnert (6): libdl: properly cast parameters for %p format string specifier iconv: explicit cast to `unsigned char*` iconv: explicitly state operator precedence ldso.c: use 'unsigned int' as loop variable type iconv: fix parameter type of utf8seq_is_{overlong,surrogate,illegal} iconv: prevent compiler warning during initialization with jis0208 J. Neuschäfer (1): bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), everywhere Marcus Haehnel (5): ldso/dl-vdso: avoid compiler warning if configured without vdso uclibc: Fix double promotion warning libm: Fix float conversion compiler warning features.h: add clang prerequisite macro buildsys: allow building with gcc-14 Sven Linker (1): c++: Remove deprecated dynamic exception specification Valentin Gehrke (1): arm: Replace deprecated asm instructions for ARMv8 AArch32 Waldemar Brodkorb (9): Clang support for gnu_inline attribute allow to use <sys/ucontext.h> add SEEK_DATA/SEEK_HOLE lseek: allow SEEK_DATA/SEEK_HOLE to be used bits/stat.h: Declare st_mtim if defined(__USE_XOPEN2K8), add missing riscv: remove incomplete context implementation, use libucontext add memfd_create syscall wrapper getrandom: remove __USE_GNU / add GRND_INSECURE bump version for 1.0.50 release Yann Le Du (1): stdlib: increase number of static atexit handlers to 32 Happy Updating! Sunshine, Waldemar Brodkorb

1 0

[PATCH] [ldso] Group conditions after `&&`
by Dmitry Chestnykh 01 Aug '24

01 Aug '24

If the conditions are not grouped we can reach this block even if `__NR_stat` is not defined. `defined __NR_stat && ((!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__))` gives us false but `LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))` may give us true. So if linux headers version is below 5.1.0 and __NR_stat is not defined we can have compilation error Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 9ec0eac60..180d03012 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -141,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name, { return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); } -#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)) +#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))) # define __NR__dl_stat __NR_stat static __always_inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf) -- 2.45.2

2 1