November 2019 - devel

[PATCH] riscv64: fix comments borrowed from or1k port
by Yann Sionneau 17 Nov '19

17 Nov '19

Signed-off-by: Yann Sionneau <ysionneau(a)kalray.eu> --- libpthread/nptl/sysdeps/riscv64/libc-tls.c | 2 +- libpthread/nptl/sysdeps/riscv64/tls.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libpthread/nptl/sysdeps/riscv64/libc-tls.c b/libpthread/nptl/sysdeps/riscv64/libc-tls.c index 500de1d..67c3a60 100644 --- a/libpthread/nptl/sysdeps/riscv64/libc-tls.c +++ b/libpthread/nptl/sysdeps/riscv64/libc-tls.c @@ -17,7 +17,7 @@ #include <sysdeps/generic/libc-tls.c> #include <dl-tls.h> -/* On OpenRISC, linker optimizations are not required, so __tls_get_addr +/* On RISC-V 64, linker optimizations are not required, so __tls_get_addr can be called even in statically linked binaries. In this case module must be always 1 and PT_TLS segment exist in the binary, otherwise it would not link. */ diff --git a/libpthread/nptl/sysdeps/riscv64/tls.h b/libpthread/nptl/sysdeps/riscv64/tls.h index 33a3781..8295c71 100644 --- a/libpthread/nptl/sysdeps/riscv64/tls.h +++ b/libpthread/nptl/sysdeps/riscv64/tls.h @@ -1,4 +1,4 @@ -/* Definition for thread-local data handling. NPTL/OR1K version. +/* Definition for thread-local data handling. NPTL/RISCV64 version. Copyright (C) 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -70,7 +70,7 @@ register tcbhead_t *__thread_self __asm__("tp"); * ------------------------------------ * | PRE | TCB | TLS MEMORY .. | * ------------------------------------ - * ^ r10 / TP + * ^ x4 / TP * * PRE is the struct pthread described below * TCB is tcbhead_t -- 1.8.3.1

2 1

[PATCH] utils and enabled UCLIBC_BUILD_SSP
by Eugene Yudin 17 Nov '19

17 Nov '19

Hi Waldemar, When building with crosstool-ng, the libssp library is compiled at the final stage of the compiler (after uClibc-ng was built), resulting in the chicken-and-egg problem with utils. The attached patch fixes the problem by building utils without stack smashing protector. [ALL ] mipsel-ndms-linux-uclibc-gcc ../utils/getconf.c -o ../utils/getconf -Wall -Wstrict-prototypes -Wstrict-aliasing -Wno-nonnull-compare -funsigned-char -fno-builtin -fno-asm -fmerge-all-constants -msoft-float -std=gnu99 -mabi=32 -mnan=legacy -fstack-protector -nostdinc -I../include -I../include -include libc-symbols.h -I../libc/sysdeps/linux/mips -I../libc/sysdeps/linux -I../ldso/ldso/mips -I../ldso/include -I. -Os -fstrict-aliasing -mno-split-addresses -pipe -D__USE_STDIO_FUTEXES__ -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT -I../libpthread/nptl -I../libpthread/nptl -I../libpthread/nptl/sysdeps/unix/sysv/linux/mips -I../libpthread/nptl/sysdeps/mips -I../libpthread/nptl/sysdeps/mips -I../libpthread/nptl/sysdeps/unix/sysv/linux -I../libpthread/nptl/sysdeps/unix/sysv/linux -I../libpthread/nptl/sysdeps/pthread -I../libpthread/nptl/sysdeps/pthread/bits -I../libpthread/nptl/sysdeps/generic -I../libc/sysdeps/linux/common -isystem /home/eugene/Documents/work/cases/13220_toolchain/crosstool-ng/.build/mipsel-ndms-linux-uclibc/buildtools/lib/gcc/mipsel-ndms-linux-uclibc/8.1.0/include-fixed -isystem /home/eugene/Documents/work/cases/13220_toolchain/crosstool-ng/.build/mipsel-ndms-linux-uclibc/buildtools/lib/gcc/mipsel-ndms-linux-uclibc/8.1.0/include -I/home/eugene/x-tools/mipsel-ndms-linux-uclibc/mipsel-ndms-linux-uclibc/sysroot/usr/include/ -DNDEBUG -fstack-protector-all -I../ldso/ldso/mips -I../ldso/include -DUCLIBC_RUNTIME_PREFIX="/" -DUCLIBC_LDSO="ld-uClibc.so.1" -I..///home/eugene/x-tools/mipsel-ndms-linux-uclibc/mipsel-ndms-linux-uclibc/sysroot/usr/include/ -DNOT_IN_libc -B../lib -Wl,-rpath-link,../lib -fstack-protector-all -I../ldso/ldso/mips -I../ldso/include -DUCLIBC_RUNTIME_PREFIX="/" -DUCLIBC_LDSO="ld-uClibc.so.1" -I..///home/eugene/x-tools/mipsel-ndms-linux-uclibc/mipsel-ndms-linux-uclibc/sysroot/usr/include/ -DNOT_IN_libc -B../lib -Wl,-rpath-link,../lib -DGETCONF_DIR='"/home/eugene/Documents/work/cases/13220_toolchain/crosstool-ng/.build/mipsel-ndms-linux-uclibc/build/build-libc-final/multilib/utils"' -MT ../utils/getconf -MD -MP -MF ../utils/.getconf.dep [ALL ] ../utils/getconf.c: In function 'main': [ALL ] ../utils/getconf.c:1238:6: warning: statement will never be executed [-Wswitch-unreachable] [ALL ] { [ALL ] ^ [ALL ] /home/eugene/Documents/work/cases/13220_toolchain/crosstool-ng/.build/mipsel-ndms-linux-uclibc/buildtools/lib/gcc/mipsel-ndms-linux-uclibc/8.1.0/../../../../mipsel-ndms-linux-uclibc/bin/ld: cannot find -lssp_nonshared [ALL ] /home/eugene/Documents/work/cases/13220_toolchain/crosstool-ng/.build/mipsel-ndms-linux-uclibc/buildtools/lib/gcc/mipsel-ndms-linux-uclibc/8.1.0/../../../../mipsel-ndms-linux-uclibc/bin/ld: cannot find -lssp [ERROR] collect2: error: ld returned 1 exit status [ALL ] Makefile.in:114: recipe for target '../utils/getconf' failed -- Best regards, Eugene

2 1

about "implement fexecve from glibc"
by Yann Sionneau 17 Nov '19

17 Nov '19

Hello, About https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=858ffad2170762… I'm not sure why exactly sizeof(int)*3 in the following line: char buf[sizeof "/proc/self/fd/" + sizeof (int) * 3]; IIUC, this is supposed to give room for the ascii decimal representation of the file descriptor number. Maybe we could read the max file descriptor number configured in the kernel from "/proc/sys/fs/file-max" (or "/proc/sys/file-max" for old systems?). So: 1/ fopen("/proc/sys/fs/file-max", "r"); 2/ fscanf(fp, "%d", &fdmax); 3/ fdmax_length = log10(fdmax); Then use fdmax_length Or, much simpler: take for granted that fd is always an int, and thus max 32 bits, and hard code that max "string length" of a file descriptor is 10 chars. But in any case maybe add a comment on top of the line to explain the "magic number". Cheers! -- Yann

2 1

fix PTRAVE_EVENT_SECCOMP typo in ptrace.h
by Joris Vink 17 Nov '19

17 Nov '19

Hi, This diff fixes a typo in the PTRACE_EVENT_SECCOMP event code. The typo itself was introduced in 2012 when syncing with glibc header files and was itself fixed in 2013 in the glibc headers. diff --git a/libc/sysdeps/linux/common/sys/ptrace.h b/libc/sysdeps/linux/common/sys/ptrace.h index 6b3c7b574..ebafe4e27 100644 --- a/libc/sysdeps/linux/common/sys/ptrace.h +++ b/libc/sysdeps/linux/common/sys/ptrace.h @@ -171,7 +171,7 @@ enum __ptrace_eventcodes PTRACE_EVENT_EXEC = 4, PTRACE_EVENT_VFORK_DONE = 5, PTRACE_EVENT_EXIT = 6, - PTRAVE_EVENT_SECCOMP = 7 + PTRACE_EVENT_SECCOMP = 7 }; /* Perform process tracing functions. REQUEST is one of the values .joris

2 1

getenv() bug
by Ata, John (US) 14 Nov '19

14 Nov '19

Hi, The getenv() library call can trap under certain conditions. It compares the passed in environment variable name (var) with the name=variables (*ep) in the environment area and returns a pointer to the value in the environment if it exists. To accomplish this, it does a memcmp() using the length of the passed in name (len) for each environment variable (*ep) against the passed in name (var). So memcmp will attempt to scan both strings for len bytes. However, if for some reason, len is equal to or greater than 16 and longer than the length of the *ep in the environment and the *ep resides near the end of a page boundary while the next page is not present or mapped, the memcmp could trap with a sigsegv error while continuing the scan with the optimization read-ahead. However, if strncmp is used instead, there is no problem since both source and destination scanning will stop when either reaches a terminating NULL Test case: We are using gcc 4.8.5 and uclibc 1.0.31. With a small environment area, attempt to do a getenv() using a variable name such as "1234567890123456". Example: file run.c contains: #include <stdlib.h> #include <stdio.h> int main() { char *n; n = getenv("1234567890123456"); printf("Return val: \"%s\"\n", n); return 0; } Then <sh> cc run.c -o run <sh> env -i 123=123 ./run. Segmentation fault Proposed fix: --- uclibc/libc/stdlib/getenv.c 2019-11-13 17:22:26.260187664 -0500 +++ uclibc/libc/stdlib/getenv.c 2019-11-13 17:22:39.376111771 -0500 @@ -20,7 +20,7 @@ return NULL; len = strlen(var); while(*ep) { - if (memcmp(var, *ep, len) == 0 && (*ep)[len] == '=') { + if (strncmp(var, *ep, len) == 0 && (*ep)[len] == '=') { return *ep + len + 1; } ep++; Then <sh> env -i 123=123 ./run. <sh> Can we get this patch upstream? Thanks, ---- 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/>

1 0