devel

devel@uclibc-ng.org

3 participants
1149 discussions

[PATCH] libpthread/nptl: create timer thread with sufficiant stack size (account for TLS)

by Peter Seiderer

Create timer thread with sufficiant stack size (take into account allocated space for thread-local-storage), for this backport glibc commit 'Create internal threads with sufficient stack size' ([1], [2]) introducing __pthread_get_minstack() and use it in __start_helper_thread(). Fixes timer_create() in case of linking with library using large TLS area (e.g openblas, see [3]). [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2c1094bd700e63a8d7f5… [2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=630f4cc3aa019ede5597… [3] http://lists.busybox.net/pipermail/buildroot/2021-April/308281.html Signed-off-by: Peter Seiderer <ps.report(a)gmx.net> --- libpthread/nptl/init.c | 6 ++++++ libpthread/nptl/pthreadP.h | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c index 4959d5ed8..5d25ded7d 100644 --- a/libpthread/nptl/init.c +++ b/libpthread/nptl/init.c @@ -337,3 +337,9 @@ __pthread_initialize_minimal_internal (void) } strong_alias (__pthread_initialize_minimal_internal, __pthread_initialize_minimal) + +size_t +__pthread_get_minstack (const pthread_attr_t *attr) +{ + return __static_tls_size + PTHREAD_STACK_MIN; +} diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h index 13205512a..c686a4ca5 100644 --- a/libpthread/nptl/pthreadP.h +++ b/libpthread/nptl/pthreadP.h @@ -377,6 +377,7 @@ weak_function; extern void __pthread_init_static_tls (struct link_map *) attribute_hidden; +extern size_t __pthread_get_minstack (const pthread_attr_t *attr); /* Namespace save aliases. */ extern int __pthread_getschedparam (pthread_t thread_id, int *policy, diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c index 514913317..60f2a724c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c @@ -164,7 +164,7 @@ __start_helper_thread (void) and should go away automatically when canceled. */ pthread_attr_t attr; (void) pthread_attr_init (&attr); - (void) pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN); + (void) pthread_attr_setstacksize (&attr, __pthread_get_minstack (&attr)); /* Block all signals in the helper thread but SIGSETXID. To do this thoroughly we temporarily have to block all signals here. The -- 2.31.1

3 years, 11 months

[PATCH] open: Add support for O_TMPFILE

by Nicolas Cavallari

Since Linux 3.11, O_TMPFILE allows to create unnamed files that can be linked later on. It is internally defined as (O_TMPFILE | O_DIRECTORY) to make it fail on old kernels. Copying definitions from glibc for O_TMPFILE is not enough to support O_TMPFILE; The open() wrapper also need to pass the mode when the flag contains O_TMPFILE, otherwise, it will pass mode 000 which will succeed but yield unexpected results. openat() is curiously not affected since it passes the mode unconditionally.. Signed-off-by: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> --- include/fcntl.h | 5 +++-- libc/sysdeps/linux/aarch64/bits/fcntl.h | 1 + libc/sysdeps/linux/alpha/bits/fcntl.h | 1 + libc/sysdeps/linux/arc/bits/fcntl.h | 1 + libc/sysdeps/linux/arm/bits/fcntl.h | 1 + libc/sysdeps/linux/avr32/bits/fcntl.h | 1 + libc/sysdeps/linux/bfin/bits/fcntl.h | 1 + libc/sysdeps/linux/c6x/bits/fcntl.h | 1 + libc/sysdeps/linux/common/open.c | 2 +- libc/sysdeps/linux/common/open64.c | 4 ++-- libc/sysdeps/linux/cris/bits/fcntl.h | 1 + libc/sysdeps/linux/csky/bits/fcntl.h | 1 + libc/sysdeps/linux/frv/bits/fcntl.h | 1 + libc/sysdeps/linux/h8300/bits/fcntl.h | 1 + libc/sysdeps/linux/hppa/bits/fcntl.h | 1 + libc/sysdeps/linux/i386/bits/fcntl.h | 1 + libc/sysdeps/linux/ia64/bits/fcntl.h | 1 + libc/sysdeps/linux/kvx/bits/fcntl.h | 1 + libc/sysdeps/linux/lm32/bits/fcntl.h | 1 + libc/sysdeps/linux/m68k/bits/fcntl.h | 1 + libc/sysdeps/linux/metag/bits/fcntl.h | 1 + libc/sysdeps/linux/microblaze/bits/fcntl.h | 1 + libc/sysdeps/linux/mips/bits/fcntl.h | 1 + libc/sysdeps/linux/nds32/bits/fcntl.h | 1 + libc/sysdeps/linux/nios2/bits/fcntl.h | 1 + libc/sysdeps/linux/or1k/bits/fcntl.h | 1 + libc/sysdeps/linux/powerpc/bits/fcntl.h | 1 + libc/sysdeps/linux/riscv64/bits/fcntl.h | 1 + libc/sysdeps/linux/sh/bits/fcntl.h | 1 + libc/sysdeps/linux/sparc/bits/fcntl.h | 1 + libc/sysdeps/linux/sparc64/bits/fcntl.h | 1 + libc/sysdeps/linux/tile/bits/fcntl.h | 1 + libc/sysdeps/linux/x86_64/bits/fcntl.h | 1 + libc/sysdeps/linux/xtensa/bits/fcntl.h | 1 + 34 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/fcntl.h b/include/fcntl.h index 35797c689..136f64d70 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -104,8 +104,9 @@ libc_hidden_proto(fcntl64) #endif /* Open FILE and return a new file descriptor for it, or -1 on error. - OFLAG determines the type of access used. If O_CREAT is on OFLAG, - the third argument is taken as a `mode_t', the mode of the created file. + OFLAG determines the type of access used. If O_CREAT or O_TMPFILE + is on OFLAG, the third argument is taken as a `mode_t', the mode of + the created file. This function is a cancellation point and therefore not marked with __THROW. */ diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h index 27922f602..c143ba9c9 100644 --- a/libc/sysdeps/linux/aarch64/bits/fcntl.h +++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h @@ -52,6 +52,7 @@ # define O_DIRECT 0200000 # define O_NOATIME 01000000 # define O_PATH 010000000 +# define O_TMPFILE 020040000 #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/alpha/bits/fcntl.h b/libc/sysdeps/linux/alpha/bits/fcntl.h index 24caaf6d4..11e68214e 100644 --- a/libc/sysdeps/linux/alpha/bits/fcntl.h +++ b/libc/sysdeps/linux/alpha/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 02000000 /* Direct disk access. */ # define O_NOATIME 04000000 /* Do not set atime. */ # define O_PATH 040000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 0100100000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/arc/bits/fcntl.h b/libc/sysdeps/linux/arc/bits/fcntl.h index af4c85af8..beb32e41e 100755 --- a/libc/sysdeps/linux/arc/bits/fcntl.h +++ b/libc/sysdeps/linux/arc/bits/fcntl.h @@ -41,6 +41,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/arm/bits/fcntl.h b/libc/sysdeps/linux/arm/bits/fcntl.h index 036f4161c..823660648 100644 --- a/libc/sysdeps/linux/arm/bits/fcntl.h +++ b/libc/sysdeps/linux/arm/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 0200000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020040000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/avr32/bits/fcntl.h b/libc/sysdeps/linux/avr32/bits/fcntl.h index 6f1039a34..ec0a3b55d 100644 --- a/libc/sysdeps/linux/avr32/bits/fcntl.h +++ b/libc/sysdeps/linux/avr32/bits/fcntl.h @@ -35,6 +35,7 @@ # define O_DIRECT 00040000 /* must be a directory */ # define O_NOATIME 01000000 /* don't set atime */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/bfin/bits/fcntl.h b/libc/sysdeps/linux/bfin/bits/fcntl.h index c0d70875b..0909ae6c4 100644 --- a/libc/sysdeps/linux/bfin/bits/fcntl.h +++ b/libc/sysdeps/linux/bfin/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 0200000 /* Direct disk access. */ # define O_NOATIME 01000000 /* don't set atime */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020040000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/c6x/bits/fcntl.h b/libc/sysdeps/linux/c6x/bits/fcntl.h index 02c2ee131..14aea565e 100644 --- a/libc/sysdeps/linux/c6x/bits/fcntl.h +++ b/libc/sysdeps/linux/c6x/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_LARGEFILE 0100000 # define O_NOATIME 01000000 # define O_PATH 010000000/* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000/* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c index ccdcf3848..ac09d40f0 100644 --- a/libc/sysdeps/linux/common/open.c +++ b/libc/sysdeps/linux/common/open.c @@ -31,7 +31,7 @@ int open(const char *file, int oflag, ...) int oldtype, result; #endif - if (oflag & O_CREAT) { + if (oflag & (O_CREAT | (O_TMPFILE &~ O_DIRECTORY))) { va_list arg; va_start(arg, oflag); mode = va_arg(arg, mode_t); diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c index 6e65a988e..9d4c06b18 100644 --- a/libc/sysdeps/linux/common/open64.c +++ b/libc/sysdeps/linux/common/open64.c @@ -10,13 +10,13 @@ #include <stdarg.h> #include <cancel.h> -/* Open FILE with access OFLAG. If OFLAG includes O_CREAT, +/* Open FILE with access OFLAG. If OFLAG includes O_CREAT or O_TMPFILE, a third argument is the file protection. */ int open64(const char *file, int oflag, ...) { mode_t mode = 0; - if (oflag & O_CREAT) { + if (oflag & (O_CREAT | (O_TMPFILE &~ O_DIRECTORY))) { va_list arg; va_start (arg, oflag); mode = va_arg (arg, mode_t); diff --git a/libc/sysdeps/linux/cris/bits/fcntl.h b/libc/sysdeps/linux/cris/bits/fcntl.h index 01920fbc7..e9bc90ea9 100644 --- a/libc/sysdeps/linux/cris/bits/fcntl.h +++ b/libc/sysdeps/linux/cris/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/csky/bits/fcntl.h b/libc/sysdeps/linux/csky/bits/fcntl.h index 817ef56e4..b36f41569 100644 --- a/libc/sysdeps/linux/csky/bits/fcntl.h +++ b/libc/sysdeps/linux/csky/bits/fcntl.h @@ -42,6 +42,7 @@ # define O_DIRECT 00040000 /* direct disk access hint */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/frv/bits/fcntl.h b/libc/sysdeps/linux/frv/bits/fcntl.h index 91d72bc66..02c8ac310 100644 --- a/libc/sysdeps/linux/frv/bits/fcntl.h +++ b/libc/sysdeps/linux/frv/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* don't set atime */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/h8300/bits/fcntl.h b/libc/sysdeps/linux/h8300/bits/fcntl.h index cd9280462..2062f7cda 100644 --- a/libc/sysdeps/linux/h8300/bits/fcntl.h +++ b/libc/sysdeps/linux/h8300/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/hppa/bits/fcntl.h b/libc/sysdeps/linux/hppa/bits/fcntl.h index a355737d0..4ce76ce5f 100644 --- a/libc/sysdeps/linux/hppa/bits/fcntl.h +++ b/libc/sysdeps/linux/hppa/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 00040000 /* Direct disk access. */ # define O_NOATIME 04000000 /* Do not set atime. */ # define O_PATH 020000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 040010000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/i386/bits/fcntl.h b/libc/sysdeps/linux/i386/bits/fcntl.h index 302aebcbc..f3c08bbe5 100644 --- a/libc/sysdeps/linux/i386/bits/fcntl.h +++ b/libc/sysdeps/linux/i386/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/ia64/bits/fcntl.h b/libc/sysdeps/linux/ia64/bits/fcntl.h index 08343c3cb..a20f44ff7 100644 --- a/libc/sysdeps/linux/ia64/bits/fcntl.h +++ b/libc/sysdeps/linux/ia64/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/kvx/bits/fcntl.h b/libc/sysdeps/linux/kvx/bits/fcntl.h index 14a75fe08..ea0c59d09 100644 --- a/libc/sysdeps/linux/kvx/bits/fcntl.h +++ b/libc/sysdeps/linux/kvx/bits/fcntl.h @@ -42,6 +42,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/lm32/bits/fcntl.h b/libc/sysdeps/linux/lm32/bits/fcntl.h index 780c0c643..0bfea6e7a 100644 --- a/libc/sysdeps/linux/lm32/bits/fcntl.h +++ b/libc/sysdeps/linux/lm32/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/m68k/bits/fcntl.h b/libc/sysdeps/linux/m68k/bits/fcntl.h index 51589fffa..5a56c8781 100644 --- a/libc/sysdeps/linux/m68k/bits/fcntl.h +++ b/libc/sysdeps/linux/m68k/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 0200000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020040000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/metag/bits/fcntl.h b/libc/sysdeps/linux/metag/bits/fcntl.h index 98dc44085..bdd697348 100644 --- a/libc/sysdeps/linux/metag/bits/fcntl.h +++ b/libc/sysdeps/linux/metag/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/microblaze/bits/fcntl.h b/libc/sysdeps/linux/microblaze/bits/fcntl.h index 64942f5a5..110927d95 100644 --- a/libc/sysdeps/linux/microblaze/bits/fcntl.h +++ b/libc/sysdeps/linux/microblaze/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/mips/bits/fcntl.h b/libc/sysdeps/linux/mips/bits/fcntl.h index 0d7fb9a5a..33251c74d 100644 --- a/libc/sysdeps/linux/mips/bits/fcntl.h +++ b/libc/sysdeps/linux/mips/bits/fcntl.h @@ -55,6 +55,7 @@ # define O_DIRECT 0x8000 /* Direct disk access hint. */ # define O_NOATIME 0x40000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 0x410000 /* Atomically create nameless file. */ #endif /* For now Linux has no synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/nds32/bits/fcntl.h b/libc/sysdeps/linux/nds32/bits/fcntl.h index 988686b27..2e6a95ec8 100644 --- a/libc/sysdeps/linux/nds32/bits/fcntl.h +++ b/libc/sysdeps/linux/nds32/bits/fcntl.h @@ -58,6 +58,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/nios2/bits/fcntl.h b/libc/sysdeps/linux/nios2/bits/fcntl.h index b70b718d2..200a35443 100644 --- a/libc/sysdeps/linux/nios2/bits/fcntl.h +++ b/libc/sysdeps/linux/nios2/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/or1k/bits/fcntl.h b/libc/sysdeps/linux/or1k/bits/fcntl.h index 1d9cc215e..c9599ef3a 100644 --- a/libc/sysdeps/linux/or1k/bits/fcntl.h +++ b/libc/sysdeps/linux/or1k/bits/fcntl.h @@ -53,6 +53,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/powerpc/bits/fcntl.h b/libc/sysdeps/linux/powerpc/bits/fcntl.h index a76d84fb5..ef1beeca0 100644 --- a/libc/sysdeps/linux/powerpc/bits/fcntl.h +++ b/libc/sysdeps/linux/powerpc/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 0400000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020040000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/riscv64/bits/fcntl.h b/libc/sysdeps/linux/riscv64/bits/fcntl.h index a22287b32..a9d7c84e0 100644 --- a/libc/sysdeps/linux/riscv64/bits/fcntl.h +++ b/libc/sysdeps/linux/riscv64/bits/fcntl.h @@ -40,6 +40,7 @@ # define O_DIRECT 00040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/sh/bits/fcntl.h b/libc/sysdeps/linux/sh/bits/fcntl.h index 32c7d4b8f..0d687f04f 100644 --- a/libc/sysdeps/linux/sh/bits/fcntl.h +++ b/libc/sysdeps/linux/sh/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h index 336f5ca43..935495937 100644 --- a/libc/sysdeps/linux/sparc/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc/bits/fcntl.h @@ -51,6 +51,7 @@ # define O_DIRECT 0x100000 /* direct disk access hint */ # define O_NOATIME 0x200000 /* Do not set atime. */ # define O_PATH 0x1000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 0x2010000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/sparc64/bits/fcntl.h b/libc/sysdeps/linux/sparc64/bits/fcntl.h index b183f7b91..395c95baf 100644 --- a/libc/sysdeps/linux/sparc64/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc64/bits/fcntl.h @@ -47,6 +47,7 @@ # define O_NOATIME 0x200000 /* Do not set atime. */ # define O_CLOEXEC 0x400000 /* Set close_on_exit. */ # define O_PATH 0x1000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 0x2010000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/tile/bits/fcntl.h b/libc/sysdeps/linux/tile/bits/fcntl.h index ca195b393..818da5c4a 100644 --- a/libc/sysdeps/linux/tile/bits/fcntl.h +++ b/libc/sysdeps/linux/tile/bits/fcntl.h @@ -40,6 +40,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif #ifdef __USE_LARGEFILE64 diff --git a/libc/sysdeps/linux/x86_64/bits/fcntl.h b/libc/sysdeps/linux/x86_64/bits/fcntl.h index e4306aae1..3547a2046 100644 --- a/libc/sysdeps/linux/x86_64/bits/fcntl.h +++ b/libc/sysdeps/linux/x86_64/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. diff --git a/libc/sysdeps/linux/xtensa/bits/fcntl.h b/libc/sysdeps/linux/xtensa/bits/fcntl.h index 757fd6b9c..5af9d2124 100644 --- a/libc/sysdeps/linux/xtensa/bits/fcntl.h +++ b/libc/sysdeps/linux/xtensa/bits/fcntl.h @@ -54,6 +54,7 @@ # define O_DIRECT 040000 /* Direct disk access. */ # define O_NOATIME 01000000 /* Do not set atime. */ # define O_PATH 010000000 /* Resolve pathname but do not open file. */ +# define O_TMPFILE 020200000 /* Atomically create nameless file. */ #endif /* For now Linux has synchronisity options for data and read operations. -- 2.31.0

3 years, 11 months

Unable to output syslog message immediately after restarting the log daemon.

by Takeru Fukushima

Hi, Unable to output messages in syslog function immediately after restarting the log daemon. Caused by ECONNREFUSED on errno in the following __vsyslog function. (libc/misc/syslog/syslog.c) void __vsyslog(int pri, const char *fmt, va_list ap) { . . . retry: if (LogFile >= 0) { do { /* can't just use write, it can result in SIGPIPE */ rc = send(LogFile, p, last_chr + 1 - p, MSG_NOSIGNAL); if (rc < 0) { switch (errno) { case EINTR: break; case ECONNRESET: /* syslogd restarted, reopen log */ closelog_intern(1); openlog_intern(); goto retry; case EAGAIN: /* syslogd stalled, noting we can do */ default: closelog_intern(1); /* 1: do not reset LogXXX globals to default */ goto write_err; } rc = 0; } p += rc; } while (p <= last_chr); goto getout; } . . . You can check it with the following sample. #include <stdio.h> #include <string.h> #include <syslog.h> #include <time.h> #include <errno.h> #include <sys/types.h> #include <sys/socket.h> #include <unistd.h> #include <sys/file.h> #include <sys/signal.h> #include <sys/syslog.h> static const struct sockaddr SyslogAddr = { .sa_family = AF_UNIX, .sa_data = "/dev/log" }; static int LogFile; static int OpenLogSocket(void); int main(void) { char tbuf[1024]; char strbuf[1024]; time_t now; int rc, count = 0; printf("\nSyslog loop start!\n\n"); if (0 == OpenLogSocket() ) { return 1; } while (fgets(strbuf, 1024, stdin)) { if ((char)'e' == strbuf[0]) { printf("Syslog loop end\n"); break; } (void)time(&now); sprintf(tbuf, "<%d>%.15s Test %u", LOG_USER | LOG_NOTICE, ctime(&now) + 4, count++); retry: rc = send(LogFile, tbuf, strlen(tbuf), MSG_NOSIGNAL); if (rc < 0) { switch (errno) { case EINTR: printf("Syslog send error EINTR\n"); break; case ECONNRESET: // case ECONNREFUSED: close(LogFile); if (0 == OpenLogSocket() ) { return 1; } goto retry; case EAGAIN: printf("Syslog send error EAGAIN\n"); break; default: printf("Syslog send error default (%d)\n", errno); break; } } } close(LogFile); return 0; } int OpenLogSocket(void) { int FdFlag; const struct timeval tv = { 1, 0 }; LogFile = socket(AF_UNIX, SOCK_DGRAM, 0); if (-1 == LogFile) { printf("Syslog open error\n"); return 0; } fcntl(LogFile, F_SETFD, FD_CLOEXEC); FdFlag = fcntl(LogFile, F_GETFL); fcntl(LogFile, F_SETFL, O_NONBLOCK | FdFlag); if (-1 != connect(LogFile, &SyslogAddr, sizeof(SyslogAddr))) { fcntl(LogFile, F_SETFL, ~O_NONBLOCK & fcntl(LogFile, F_GETFL)); setsockopt(LogFile, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); } else { printf("Syslog connect error\n"); close(LogFile); return 0; } return 1; } When you run the sample, you can send the syslog by return input. If the log daemon is restarted without exiting the sample, the syslog cannot be sent. If you delete the comment (//) in the sample, you can send the syslog. OS：OpenWrt Chaos Calmer 15.05.1 Linux-3.14.77 uClibc-ng-1.0.14 I think it needs to be at least ECONNREFUSED. Thanks, -- Takeru Fukushima

4 years, 1 month

[PATCH] extra/locale: fix gen_wc8bit diagnostic output

by Max Filippov

Diagnostic for missing UTF locale is printed to stdout instead of stderr, fix that. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- extra/locale/gen_wc8bit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/locale/gen_wc8bit.c b/extra/locale/gen_wc8bit.c index 8031df1cf4a5..110541ad5ccc 100644 --- a/extra/locale/gen_wc8bit.c +++ b/extra/locale/gen_wc8bit.c @@ -121,7 +121,8 @@ int main(int argc, char **argv) } locale_failure: - printf("could not find a UTF8 locale ... please enable en_US.UTF-8\n"); + fprintf(stderr, + "could not find a UTF8 locale ... please enable en_US.UTF-8\n"); return EXIT_FAILURE; locale_success: pclose(fp); -- 2.20.1

4 years, 2 months

new release 1.0.37

by Waldemar Brodkorb

Hi, a new release of uClibc-ng is avalaible. Please update to 1.0.37. It contains a security fix for malloc-simple. best regards Waldemar

4 years, 2 months

Release announcements

by Ata, John (US)

Hi, I seem to recall in the past that new uclibc-ng releases would be announced in this group. The last two release announcements (1.0.35 and 1.0.36) do not appear in my feed. Perhaps my mail server discarded them but I wonder if we are still announcing them to the group or are we counting on people manually checking the website? Take care, ---- John Ata, CISSP Senior Principal Software Engineer Electronics Systems STOP Operating System<http://www.baesystems.com/en-us/product/stop> Software Development T 703-563-8115 | F 703-668-4359 | john.ata(a)baesystems.com<mailto:john.ata@baesystems.com> http://www.baesystems.com/csp [cid:image001.png@01D138BC.8E54E330][cid:image003.png@01D138BC.8E54E330]<http://www.twitter.com/baesystemsinc>[cid:image004.png@01D138BC.8E54E330]<http://www.youtube.com/baesystemsinc>[cid:image006.png@01D138BC.8E54E330]<http://www.flickr.com/photos/baesystemsinc/>

4 years, 3 months

[PATCH] libcrypt: add missing errno.h header

by Yann Sionneau

Fixes: libcrypt/crypt.c:29:15: error: 'EINVAL' undeclared (first use in this function) __set_errno(EINVAL); ^~~~~~ Signed-off-by: Yann Sionneau <ysionneau(a)kalray.eu> --- libcrypt/crypt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c index 9819029f2..cfcd11f91 100644 --- a/libcrypt/crypt.c +++ b/libcrypt/crypt.c @@ -6,6 +6,7 @@ #include <unistd.h> #include <crypt.h> +#include <errno.h> #include "libcrypt.h" char *crypt(const char *key, const char *salt) -- 2.17.1

4 years, 3 months

[PATCH] misc: add test for hasmntopt() option matching

by yann＠sionneau.net

From: Yann Sionneau <yann(a)sionneau.net> Signed-off-by: Yann Sionneau <yann(a)sionneau.net> --- test/misc/tst-hasmntopt.c | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 test/misc/tst-hasmntopt.c diff --git a/test/misc/tst-hasmntopt.c b/test/misc/tst-hasmntopt.c new file mode 100644 index 0000000..17655bd --- /dev/null +++ b/test/misc/tst-hasmntopt.c @@ -0,0 +1,47 @@ +/* Copyright (C) 2020 by Yann Sionneau <yann(a)sionneau.net> */ + +#include <stdio.h> +#include <mntent.h> +#include <stdlib.h> +#include <string.h> + +static int +do_test (void) +{ + char *res; + struct mntent m; + + /* check that "ro" does not match "erROr" */ + m.mnt_opts = "error"; + res = hasmntopt (&m, MNTOPT_RO); + if (res != NULL) { + puts ("error: hasmntopt() picked up non existing option"); + exit (1); + } + + /* check that "ro" does not match "remount-ro" */ + m.mnt_opts = "rw,relatime,errors=remount-ro"; + res = hasmntopt (&m, MNTOPT_RO); + if (res != NULL) { + puts ("error: hasmntopt() picked up non existing option"); + exit (1); + } + + /* check that "ro" does match "ro" */ + m.mnt_opts = "noatime,ro"; + res = hasmntopt (&m, MNTOPT_RO); + if (res == NULL) { + puts ("error: hasmntopt() did not pick up an existing option"); + exit (1); + } + + if (strncmp(res, "ro", 2) != 0) { + puts ("error: hasmntopt() did not return a pointer to corresponding option"); + exit (1); + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- 2.25.1

4 years, 4 months

[PATCH] hasmntopt: better option matching

by yann＠sionneau.net

From: Yann Sionneau <yann(a)sionneau.net> Previous implementation was respecting the man page description of what the function should do. Also the function does not seem to be defined by POSIX. But... to be really useful the function needs to handle option matching and not just substring matching. This is copy pasted from glibc. This fixes issue reported by https://github.com/wbx-github/uclibc-ng/issues/8 that can happen for instance there: https://github.com/frida/glib/blob/master/gio/gunixmounts.c#L622 Signed-off-by: Yann Sionneau <yann(a)sionneau.net> --- libc/misc/mntent/mntent.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index 608f84c1a..610e35af6 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2000-2006 Erik Andersen <andersen(a)uclibc.org> + * Copyright (C) 1995-2020 Free Software Foundation, Inc. * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -92,9 +93,25 @@ int addmntent(FILE * filep, const struct mntent *mnt) mnt->mnt_type, mnt->mnt_opts, mnt->mnt_freq, mnt->mnt_passno) < 0 ? 1 : 0); } -char *hasmntopt(const struct mntent *mnt, const char *opt) +/* Search MNT->mnt_opts for an option matching OPT. + Returns the address of the substring, or null if none found. */ +char *hasmntopt (const struct mntent *mnt, const char *opt) { - return strstr(mnt->mnt_opts, opt); + const size_t optlen = strlen(opt); + char *rest = mnt->mnt_opts, *p; + + while ((p = strstr(rest, opt)) != NULL) { + if ((p == rest || p[-1] == ',') + && (p[optlen] == '\0' || p[optlen] == '=' || p[optlen] == ',')) + return p; + + rest = strchr(p, ','); + if (rest == NULL) + break; + ++rest; + } + + return NULL; } FILE *setmntent(const char *name, const char *mode) -- 2.25.1

4 years, 4 months

New release

by Petr Vorel

Hi Waldemar, sorry to be impatient, but would you mind to create release to help distros not backporting all the fixes? Kind regards, Petr

4 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel