devel

devel@uclibc-ng.org

3 participants
1149 discussions

Start a nNew thread

uClibc-ng - small C library for embedded systems branch 1.0 updated. v1.0.10-33-g756575e

by wbx＠helium.waldemar-brodkorb.de

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. v1.0.10-31-gcddda5f

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via cddda5f9beb3d61f1122df95ccfcf855931775b7 (commit) from 121ee94aa6af104ed33a83bc573739a6f2c02f54 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cddda5f9beb3d61f1122df95ccfcf855931775b7 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Jan 10 09:08:14 2016 +0100 order of special checks matters The order of special checks seems critical for some applications. Xorg 1.18.0 fails to start with XNFreallocarray error. Took me some time to run with MALLOC_DEBUG=2 to find out. MALLOC_STANDARD is not affected. ----------------------------------------------------------------------- Summary of changes: libc/stdlib/malloc/realloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c index 8d55289..bdfb526 100644 --- a/libc/stdlib/malloc/realloc.c +++ b/libc/stdlib/malloc/realloc.c @@ -26,14 +26,16 @@ realloc (void *mem, size_t new_size) size_t size; char *base_mem; + if (! mem) + return malloc (new_size); + /* Check for special cases. */ if (! new_size) { free (mem); return NULL; } - if (! mem) - return malloc (new_size); + /* This matches the check in malloc() */ if (unlikely(((unsigned long)new_size > (unsigned long)(MALLOC_HEADER_SIZE*-2)))) return NULL; hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. v1.0.10-30-g121ee94

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 121ee94aa6af104ed33a83bc573739a6f2c02f54 (commit) via 097e5f6b5af44c8cfc365b0b7a9d8e628e647607 (commit) via 48d8d11d697e7433e607b2519a022bd0ee415c12 (commit) via ad1fca9b927f469e2fecdfbfa4e3ad130afa66ab (commit) via 016e7cb223c2a28f0a65980d978124b463f21184 (commit) via 6c3db949b0627674267f078ffdefc48de1484a74 (commit) from 55532a6ae663cc0f20bdf62d6c5d06db766b55f3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 121ee94aa6af104ed33a83bc573739a6f2c02f54 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:34:46 2016 +0100 NPTL: fix infinite recursion fix infinite recursion on application exit triggered by linking libc before libpthread. Patch from OpenWrt. Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit 097e5f6b5af44c8cfc365b0b7a9d8e628e647607 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:36:46 2016 +0100 NPTL: Fix __pthread_once old style declaration Trivial fix. Signed-Off-By: Leonid Lisovskiy <lly.dev(a)gmail.com> commit 48d8d11d697e7433e607b2519a022bd0ee415c12 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:35:57 2016 +0100 Add implementation for copysignl for i386 Patch from OpenWrt. Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit ad1fca9b927f469e2fecdfbfa4e3ad130afa66ab Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:33:19 2016 +0100 Implement legacy bcopy/bzero/bcmp/index/rindex as inline functions patch from OpenWrt. Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit 016e7cb223c2a28f0a65980d978124b463f21184 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:39:45 2016 +0100 Provide XTI __t_scalar_t types, like glibc Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit 6c3db949b0627674267f078ffdefc48de1484a74 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Jan 7 23:39:02 2016 +0100 test-skeleton: Fixes from glibc glibc commits d7a05d0728 test-skeleton: Kill any child process's offspring cc8dcf96e7 test-skeleton: Support temporary files without memory leaks [BZ#18333] Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: include/string.h | 38 +++++++++++--- libc/sysdeps/linux/common/bits/types.h | 4 ++ libc/sysdeps/linux/i386/Makefile.arch | 3 +- libc/sysdeps/linux/i386/copysign.S | 55 ++++++++++++++++++++ libpthread/nptl/cleanup_defer_compat.c | 8 +-- libpthread/nptl/init.c | 4 +- .../sysdeps/unix/sysv/linux/mips/pthread_once.c | 4 +- test/test-skeleton.c | 32 +++++++++--- 8 files changed, 123 insertions(+), 25 deletions(-) create mode 100644 libc/sysdeps/linux/i386/copysign.S diff --git a/include/string.h b/include/string.h index 80585ef..8315203 100644 --- a/include/string.h +++ b/include/string.h @@ -362,18 +362,40 @@ extern char *index (const char *__s, int __c) /* Find the last occurrence of C in S (same as strrchr). */ extern char *rindex (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); -# else -# ifdef __UCLIBC_SUSV3_LEGACY_MACROS__ +# elif defined(__UCLIBC_SUSV3_LEGACY_MACROS__) && !defined(_STRINGS_H) /* bcopy/bzero/bcmp/index/rindex are marked LEGACY in SuSv3. * They are replaced as proposed by SuSv3. Don't sync this part * with glibc and keep it in sync with strings.h. */ -# define bcopy(src,dest,n) (memmove((dest), (src), (n)), (void) 0) -# define bzero(s,n) (memset((s), '\0', (n)), (void) 0) -# define bcmp(s1,s2,n) memcmp((s1), (s2), (size_t)(n)) -# define index(s,c) strchr((s), (c)) -# define rindex(s,c) strrchr((s), (c)) -# endif +/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ +static __inline__ void bcopy (__const void *__src, void *__dest, size_t __n) +{ + memmove(__dest, __src, __n); +} + +/* Set N bytes of S to 0. */ +static __inline__ void bzero (void *__s, size_t __n) +{ + memset(__s, 0, __n); +} + +/* Compare N bytes of S1 and S2 (same as memcmp). */ +static __inline__ int bcmp (__const void *__s1, __const void *__s2, size_t __n) +{ + return memcmp(__s1, __s2, __n); +} + +/* Find the first occurrence of C in S (same as strchr). */ +static __inline__ char *index (__const char *__s, int __c) +{ + return strchr(__s, __c); +} + +/* Find the last occurrence of C in S (same as strrchr). */ +static __inline__ char *rindex (__const char *__s, int __c) +{ + return strrchr(__s, __c); +} # endif /* Return the position of the first bit set in I, or 0 if none are set. diff --git a/libc/sysdeps/linux/common/bits/types.h b/libc/sysdeps/linux/common/bits/types.h index 4029167..9d72d45 100644 --- a/libc/sysdeps/linux/common/bits/types.h +++ b/libc/sysdeps/linux/common/bits/types.h @@ -188,6 +188,10 @@ typedef __off64_t __loff_t; /* Type of file sizes and offsets (LFS). */ typedef __quad_t *__qaddr_t; typedef char *__caddr_t; +/* Used in XTI. */ +typedef long int __t_scalar_t; +typedef unsigned long int __t_uscalar_t; + /* Duplicates info from stdint.h but this is used in unistd.h. */ __STD_TYPE __SWORD_TYPE __intptr_t; diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch index 581e10a..1c72d23 100644 --- a/libc/sysdeps/linux/i386/Makefile.arch +++ b/libc/sysdeps/linux/i386/Makefile.arch @@ -9,7 +9,8 @@ CSRC-y := brk.c __syscall_error.c sigaction.c SSRC-y := \ __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ - sync_file_range.S syscall.S mmap.S + sync_file_range.S syscall.S mmap.S \ + copysign.S SSRC-$(UCLIBC_HAS_LFS) += mmap64.S SSRC-$(if $(findstring yy,$(UCLIBC_HAS_ADVANCED_REALTIME)$(UCLIBC_HAS_LFS)),y) += posix_fadvise64.S diff --git a/libc/sysdeps/linux/i386/copysign.S b/libc/sysdeps/linux/i386/copysign.S new file mode 100644 index 0000000..6499ce0 --- /dev/null +++ b/libc/sysdeps/linux/i386/copysign.S @@ -0,0 +1,55 @@ +/* + * Written by J.T. Conklin <jtc(a)netbsd.org>. + * Public domain. + */ + +#define _ERRNO_H 1 +#include <features.h> +#include <bits/errno.h> + +.text +.global copysign +.type copysign,%function +copysign: + movl 16(%esp),%edx + movl 8(%esp),%eax + andl $0x80000000,%edx + andl $0x7fffffff,%eax + orl %edx,%eax + movl %eax,8(%esp) + fldl 4(%esp) + ret +.size copysign,.-copysign + +libc_hidden_def(copysign) + +.global copysignf +.type copysignf,%function +copysignf: + movl 8(%esp),%edx + movl 4(%esp),%eax + andl $0x80000000,%edx + andl $0x7fffffff,%eax + orl %edx,%eax + movl %eax,4(%esp) + flds 4(%esp) + ret +.size copysignf,.-copysignf + +libc_hidden_def(copysignf) + +.global copysignl +.type copysignl,%function +copysignl: + movl 24(%esp),%edx + movl 12(%esp),%eax + andl $0x8000,%edx + andl $0x7fff,%eax + orl %edx,%eax + movl %eax,12(%esp) + fldt 4(%esp) + ret +.size copysignl,.-copysignl + +libc_hidden_def(copysignl) + diff --git a/libpthread/nptl/cleanup_defer_compat.c b/libpthread/nptl/cleanup_defer_compat.c index 64ecb13..ba15c79 100644 --- a/libpthread/nptl/cleanup_defer_compat.c +++ b/libpthread/nptl/cleanup_defer_compat.c @@ -21,7 +21,7 @@ void attribute_protected -_pthread_cleanup_push_defer ( +__pthread_cleanup_push_defer ( struct _pthread_cleanup_buffer *buffer, void (*routine) (void *), void *arg) @@ -56,12 +56,12 @@ _pthread_cleanup_push_defer ( THREAD_SETMEM (self, cleanup, buffer); } -strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer) +strong_alias (__pthread_cleanup_push_defer, _pthread_cleanup_push_defer) void attribute_protected -_pthread_cleanup_pop_restore ( +__pthread_cleanup_pop_restore ( struct _pthread_cleanup_buffer *buffer, int execute) { @@ -96,4 +96,4 @@ _pthread_cleanup_pop_restore ( if (execute) buffer->__routine (buffer->__arg); } -strong_alias (_pthread_cleanup_pop_restore, __pthread_cleanup_pop_restore) +strong_alias (__pthread_cleanup_pop_restore, _pthread_cleanup_pop_restore) diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c index 776bec7..eb84d6e 100644 --- a/libpthread/nptl/init.c +++ b/libpthread/nptl/init.c @@ -104,8 +104,8 @@ static const struct pthread_functions pthread_functions = .ptr___pthread_key_create = __pthread_key_create_internal, .ptr___pthread_getspecific = __pthread_getspecific_internal, .ptr___pthread_setspecific = __pthread_setspecific_internal, - .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer, - .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore, + .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer, + .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore, .ptr_nthreads = &__nptl_nthreads, .ptr___pthread_unwind = &__pthread_unwind, .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd, diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c index 393f0d7..7cf918e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c @@ -35,9 +35,7 @@ clear_once_control (void *arg) int attribute_protected -__pthread_once (once_control, init_routine) - pthread_once_t *once_control; - void (*init_routine) (void); +__pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) { while (1) { diff --git a/test/test-skeleton.c b/test/test-skeleton.c index 03c2ff8..4f26804 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -17,6 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <assert.h> #include <errno.h> #include <getopt.h> #include <malloc.h> @@ -53,7 +54,7 @@ static const char *test_dir; struct temp_name_list { struct qelem q; - const char *name; + char *name; } *temp_name_list; /* Add temporary files in list. */ @@ -63,14 +64,17 @@ add_temp_file (const char *name) { struct temp_name_list *newp = (struct temp_name_list *) calloc (sizeof (*newp), 1); - if (newp != NULL) + char *newname = strdup (name); + if (newp != NULL && newname != NULL) { - newp->name = name; + newp->name = newname; if (temp_name_list == NULL) temp_name_list = (struct temp_name_list *) &newp->q; else insque (newp, temp_name_list); } + else + free (newp); } /* Delete all temporary files. */ @@ -80,11 +84,19 @@ delete_temp_files (void) while (temp_name_list != NULL) { remove (temp_name_list->name); - temp_name_list = (struct temp_name_list *) temp_name_list->q.q_forw; + free (temp_name_list->name); + + struct temp_name_list *next + = (struct temp_name_list *) temp_name_list->q.q_forw; + free (temp_name_list); + temp_name_list = next; } } -/* Create a temporary file. */ +/* Create a temporary file. Return the opened file descriptor on + success, or -1 on failure. Write the file name to *FILENAME if + FILENAME is not NULL. In this case, the caller is expected to free + *FILENAME. */ static int __attribute__ ((unused)) create_temp_file (const char *base, char **filename) @@ -112,6 +124,8 @@ create_temp_file (const char *base, char **filename) add_temp_file (fname); if (filename != NULL) *filename = fname; + else + free (fname); return _fd; } @@ -125,7 +139,10 @@ signal_handler (int sig __attribute__ ((unused))) int status; int i; - /* Send signal. */ + assert (pid > 1); + /* Kill the whole process group. */ + kill (-pid, SIGKILL); + /* In case setpgid failed in the child, kill it individually too. */ kill (pid, SIGKILL); /* Wait for it to terminate. */ @@ -337,7 +354,8 @@ main (int argc, char *argv[]) /* We put the test process in its own pgrp so that if it bogusly generates any job control signals, they won't hit the whole build. */ - setpgid (0, 0); + if (setpgid (0, 0) != 0) + printf ("Failed to set the process group ID: %m\n"); /* Execute the test function and exit with the return value. */ exit (TEST_FUNCTION); hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. v1.0.10-24-g55532a6

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 55532a6ae663cc0f20bdf62d6c5d06db766b55f3 (commit) from fad6c6021feb6c2dd4a3bd5de1113994d4a9b04e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 55532a6ae663cc0f20bdf62d6c5d06db766b55f3 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sat Jan 9 09:09:51 2016 +0100 fix compile with DODEBUG=y Since more projects using two-stage cross-compile process we cannot add libgcc_eh.a unconditionally. We must check if a real file is referenced by the cross-compiler. Toolchains with --disabel-shared build have a single libgcc.a containing all required symbols. Tested with a debug build for x86. ----------------------------------------------------------------------- Summary of changes: Rules.mak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rules.mak b/Rules.mak index 38b4cc2..ab88471 100644 --- a/Rules.mak +++ b/Rules.mak @@ -783,8 +783,11 @@ $(eval $(call cache-output-var,LIBGCC_A,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-fil $(eval $(call cache-output-var,LIBGCC_EH,$(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a)) # with -O0 we (e.g. lockf) might end up with references to # _Unwind_Resume, so pull in gcc_eh in this case.. +# with a --disable-shared toolchain, libgcc_eh.a and libgcc.a are combined +# in libgcc.a, so check if the printed file exist, before adding to the commandline +LIBGCC_EH_FILE := $(shell if [ -f $(LIBGCC_EH) ]; then echo $(LIBGCC_EH); fi) LIBGCC_DIR := $(dir $(LIBGCC_A)) -LIBGCC := $(LIBGCC_A) $(if $(DODEBUG),$(LIBGCC_EH)) +LIBGCC := $(LIBGCC_A) $(if $(DODEBUG),$(LIBGCC_EH_FILE)) # moved from libpthread/linuxthreads ifeq ($(UCLIBC_CTOR_DTOR),y) hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

[PATCH getdents is deprecated. So redirect to readdir64 in __ARCH_HAS_DEPRECATED_SYSCALLS__.

by Yoshinori Sato

Signed-off-by: Yoshinori Sato <ysato(a)users.sourceforge.jp> --- libc/misc/dirent/__readdir.c | 39 ++++++++++++++++++++++++++++++++++++++ libc/misc/dirent/readdir.c | 45 ++++---------------------------------------- libc/misc/dirent/readdir64.c | 12 ++++++++++-- 3 files changed, 53 insertions(+), 43 deletions(-) create mode 100644 libc/misc/dirent/__readdir.c diff --git a/libc/misc/dirent/__readdir.c b/libc/misc/dirent/__readdir.c new file mode 100644 index 0000000..18f6d79 --- /dev/null +++ b/libc/misc/dirent/__readdir.c @@ -0,0 +1,39 @@ +__DIRENT_TYPE *__READDIR(DIR * dir) +{ + ssize_t bytes; + __DIRENT_TYPE *de; + + if (!dir) { + __set_errno(EBADF); + return NULL; + } + + __UCLIBC_MUTEX_LOCK(dir->dd_lock); + + do { + if (dir->dd_size <= dir->dd_nextloc) { + /* read dir->dd_max bytes of directory entries. */ + bytes = __GETDENTS(dir->dd_fd, dir->dd_buf, dir->dd_max); + if (bytes <= 0) { + de = NULL; + goto all_done; + } + dir->dd_size = bytes; + dir->dd_nextloc = 0; + } + + de = (__DIRENT_TYPE *) (((char *) dir->dd_buf) + dir->dd_nextloc); + + /* Am I right? H.J. */ + dir->dd_nextloc += de->d_reclen; + + /* We have to save the next offset here. */ + dir->dd_nextoff = de->d_off; + + /* Skip deleted files. */ + } while (de->d_ino == 0); + +all_done: + __UCLIBC_MUTEX_UNLOCK(dir->dd_lock); + return de; +} diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c index 7517106..b5a23bb 100644 --- a/libc/misc/dirent/readdir.c +++ b/libc/misc/dirent/readdir.c @@ -10,53 +10,16 @@ #include <stddef.h> #include "dirstream.h" -#ifndef __READDIR +#if !defined __ARCH_HAS_DEPRECATED_SYSCALLS__ # define __READDIR readdir # define __DIRENT_TYPE struct dirent # define __GETDENTS __getdents -#endif - -__DIRENT_TYPE *__READDIR(DIR * dir) -{ - ssize_t bytes; - __DIRENT_TYPE *de; - - if (!dir) { - __set_errno(EBADF); - return NULL; - } - - __UCLIBC_MUTEX_LOCK(dir->dd_lock); - - do { - if (dir->dd_size <= dir->dd_nextloc) { - /* read dir->dd_max bytes of directory entries. */ - bytes = __GETDENTS(dir->dd_fd, dir->dd_buf, dir->dd_max); - if (bytes <= 0) { - de = NULL; - goto all_done; - } - dir->dd_size = bytes; - dir->dd_nextloc = 0; - } - - de = (__DIRENT_TYPE *) (((char *) dir->dd_buf) + dir->dd_nextloc); - - /* Am I right? H.J. */ - dir->dd_nextloc += de->d_reclen; - - /* We have to save the next offset here. */ - dir->dd_nextoff = de->d_off; - /* Skip deleted files. */ - } while (de->d_ino == 0); +# include "__readdir.c" -all_done: - __UCLIBC_MUTEX_UNLOCK(dir->dd_lock); - return de; -} libc_hidden_def(__READDIR) -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +# if WORDSIZE == 64 strong_alias_untyped(readdir,readdir64) libc_hidden_def(readdir64) +# endif #endif diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c index 17577a7..e16d6a1 100644 --- a/libc/misc/dirent/readdir64.c +++ b/libc/misc/dirent/readdir64.c @@ -6,11 +6,19 @@ #include <_lfs_64.h> #include <dirent.h> +#include <errno.h> +#define __need_NULL +#include <stddef.h> +#include "dirstream.h" #if __WORDSIZE != 64 # define __READDIR readdir64 # define __DIRENT_TYPE struct dirent64 # define __GETDENTS __getdents64 - -# include "readdir.c" #endif + +# include "__readdir.c" + +libc_hidden_def(__READDIR) +strong_alias_untyped(readdir64,readdir) +libc_hidden_def(readdir) -- 2.6.1

9 years, 2 months

[PATCH] inet/getaddrinfo: simplest /etc/gai.conf to control IPv6/IPv4 addresses sort order

by Leonid Lisovskiy

Implement simplest variant of /etc/gai.conf to control getaddrinfo IPv6/IPv4 addresses sorting. Keep the default sort order - IPv6 first, IPv4 second. To invert it, just create /etc/gai.conf containing single line: precedence ::ffff:0:0/96 100 Example before: $ nslookup security.debian.org 8.8.8.8 Server: 8.8.8.8 Address 1: 8.8.8.8 google-public-dns-a.google.com Name: security.debian.org Address 1: 2001:a78:5:0:216:35ff:fe7f:be4f villa.debian.org Address 2: 2001:a78:5:1:216:35ff:fe7f:6ceb lobos.debian.org Address 3: 195.20.242.89 wieck.debian.org Address 4: 212.211.132.250 lobos.debian.org Address 5: 212.211.132.32 villa.debian.org After patch & precedence set in /etc/gai.conf: $ nslookup security.debian.org 8.8.8.8 Server: 8.8.8.8 Address 1: 8.8.8.8 google-public-dns-a.google.com Name: security.debian.org Address 1: 195.20.242.89 wieck.debian.org Address 2: 212.211.132.250 lobos.debian.org Address 3: 212.211.132.32 villa.debian.org Address 4: 2001:a78:5:0:216:35ff:fe7f:be4f villa.debian.org Address 5: 2001:a78:5:1:216:35ff:fe7f:6ceb lobos.debian.org bloat-o-meter report: function old new delta getaddrinfo 726 1138 +412 gaih_inet 2660 2692 +32 .rodata 16618 16643 +25 __gai_precedence - 1 +1 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 4/0 up/down: 882/0) Total: 470 bytes Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c --- a/libc/inet/getaddrinfo.c +++ b/libc/inet/getaddrinfo.c @@ -62,6 +62,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <stdbool.h> #include <arpa/inet.h> #include <sys/socket.h> #include <netinet/in.h> @@ -70,6 +71,7 @@ #include <sys/utsname.h> #include <net/if.h> #include <ifaddrs.h> +#include "internal/parse_config.h" #define GAIH_OKIFUNSPEC 0x0100 #define GAIH_EAI ~(GAIH_OKIFUNSPEC) @@ -348,6 +350,11 @@ gaih_inet_serv(const char *servicename, const struct gaih_typeproto *tp, return 0; } +#if defined __UCLIBC_HAS_IPV6__ +static uint8_t __gai_precedence = 0; /* =1 - IPv6, IPv4 + =2 - IPv4, IPv6 */ +#endif + /* NB: also uses h,pat,rc,no_data variables */ #define gethosts(_family, _type) \ { \ @@ -552,21 +559,32 @@ gaih_inet(const char *name, const struct gaih_service *service, if (at->family == AF_UNSPEC && !(req->ai_flags & AI_NUMERICHOST)) { struct hostent *h; struct gaih_addrtuple **pat = &at; - int no_data = 0; - int no_inet6_data; + int no_data, no_inet6_data; +#if defined __UCLIBC_HAS_IPV6__ + bool first_try = true; +#endif /* * If we are looking for both IPv4 and IPv6 address we don't want * the lookup functions to automatically promote IPv4 addresses to * IPv6 addresses. */ + no_inet6_data = no_data = 0; #if defined __UCLIBC_HAS_IPV6__ + if (__gai_precedence == 2) + goto try_v4; + + try_v6: if (req->ai_family == AF_UNSPEC || req->ai_family == AF_INET6) if (!(req->ai_flags & AI_ADDRCONFIG) || (seen & SEEN_IPV6)) gethosts(AF_INET6, struct in6_addr); -#endif no_inet6_data = no_data; + if (!first_try) + goto tried_all; + first_try = false; + try_v4: +#endif if (req->ai_family == AF_INET || (!v4mapped && req->ai_family == AF_UNSPEC) || (v4mapped && (no_inet6_data != 0 || (req->ai_flags & AI_ALL))) @@ -574,7 +592,14 @@ gaih_inet(const char *name, const struct gaih_service *service, if (!(req->ai_flags & AI_ADDRCONFIG) || (seen & SEEN_IPV4)) gethosts(AF_INET, struct in_addr); } +#if defined __UCLIBC_HAS_IPV6__ + if (first_try) { + first_try = false; + goto try_v6; + } + tried_all: +#endif if (no_data != 0 && no_inet6_data != 0) { /* If both requests timed out report this. */ if (no_data == EAI_AGAIN && no_inet6_data == EAI_AGAIN) @@ -775,6 +800,71 @@ static const struct gaih gaih[] = { { PF_UNSPEC, NULL } }; +#if defined __UCLIBC_HAS_IPV6__ + +/* + * A call to getaddrinfo might return multiple answers. To provide + * possibility to change the sorting we must use /etc/gai.conf file, + * like glibc. + * + * gai.conf format: + * + * label <netmask> <precedence> + * The value is added to the label table used in + * the RFC 3484 sorting. If any label definition + * is present in the configuration file is present, + * the default table is not used. All the label + * definitions of the default table which are to + * be maintained have to be duplicated. + * precedence <netmask> <precedence> + * This keyword is similar to label, but instead + * the value is added to the precedence table as + * specified in RFC 3484. Once again, the presence + * of a single precedence line in the configuration + * file causes the default table to not be used. + * + * The simplified uclibc's implementation allows to change the IPv4/IPv6 + * sorting order for a whole address space only, i.e + * "precedence ::ffff:0:0/96 100" is only supported. + */ +static void __gai_conf_parse(void) +{ + /* NO reread of /etc/gai.conf on change. */ + if (__gai_precedence != 0) + return; + + __gai_precedence = 1; /* default IPv6 */ + + parser_t *parser; + char **tok = NULL; + + parser = config_open("/etc/gai.conf"); + if (!parser) + return; + + while (config_read(parser, &tok, 3, 3, "# \t", PARSE_NORMAL)) { + if (strcmp(tok[0], "precedence") == 0) { + char *pfx; + struct in6_addr mask; + + pfx = strchr(tok[1], '/'); + if (!pfx) + continue; + *(pfx++) = 0; + if (inet_pton(AF_INET6, tok[1], &mask) <= 0) + continue; + if (IN6_IS_ADDR_V4MAPPED(&mask) + && mask.s6_addr32[3] == 0 + && atoi(pfx) == 96 && atoi(tok[2]) == 100) + __gai_precedence = 2; /* IPv4 first */ + } + } + config_close(parser); +} +#else +# define __gai_conf_parse(x) +#endif /* __UCLIBC_HAS_IPV6__ */ + void freeaddrinfo(struct addrinfo *ai) { @@ -834,6 +923,7 @@ getaddrinfo(const char *name, const char *service, } else pservice = NULL; + __gai_conf_parse(); g = gaih; pg = NULL; p = NULL; --

9 years, 2 months

[PATCH] Fix "pselect: Use linux pselect6 syscall when available"

by Leonid Lisovskiy

Commit e3c3bf2b58 introduce use of pselect6, but has following disadvantages: * Use of userspace types in args67 structure - it breaks, for example, configs when 32-bit uClibc-ng compiled against 64-bit kernel. Syscall will always return EINVAL. We must use __kernel_* types and __SYSCALL_SIGSET_T_SIZE. * It have excess checks for NSEC_PER_SEC. Original code from select() implementation has struct timeval => struct timespec conversion, kernel select() syscall implementation do the same. But none of libc versions (glibc, eglibc, musl) I know, perform similar checks for pselect() - there is no structure fields conversions, just struct timespec through all the calls. To have such checks in uClibc-ng we need one example, at least. * It is possible to avoid extra userspace reads from kernel code if sigmask == NULL. I suggest to do it, for a few bytes cost. * Commit didn't add test case to testsuite. Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- libc/sysdeps/linux/common/pselect.c | 67 ++++++++++++------------------------- test/unistd/tst-pselect.c | 51 ++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 45 deletions(-) create mode 100644 test/unistd/tst-pselect.c diff --git a/libc/sysdeps/linux/common/pselect.c b/libc/sysdeps/linux/common/pselect.c index 3f1dd28..fbe85b7 100644 --- a/libc/sysdeps/linux/common/pselect.c +++ b/libc/sysdeps/linux/common/pselect.c @@ -31,55 +31,32 @@ static int __NC(pselect)(int nfds, fd_set *readfds, fd_set *writefds, const sigset_t *sigmask) { #ifdef __NR_pselect6 -#define NSEC_PER_SEC 1000000000L - struct timespec _ts, *ts = 0; - if (timeout) { - /* The Linux kernel can in some situations update the timeout value. - * We do not want that so use a local variable. - */ + /* The Linux kernel can in some situations update the timeout value. + * We do not want that so use a local variable. + */ + struct timespec _ts; + + if (timeout != NULL) { _ts = *timeout; + timeout = &_ts; + } + /* Note: the system call expects 7 values but on most architectures + we can only pass in 6 directly. If there is an architecture with + support for more parameters a new version of this file needs to + be created. */ + struct { + __kernel_ulong_t ss; + __kernel_size_t ss_len; + } data; - /* GNU extension: allow for timespec values where the sub-sec - * field is equal to or more than 1 second. The kernel will - * reject this on us, so take care of the time shift ourself. - * Some applications (like readline and linphone) do this. - * See 'clarification on select() type calls and invalid timeouts' - * on the POSIX general list for more information. - */ - if (_ts.tv_nsec >= NSEC_PER_SEC) { - _ts.tv_sec += _ts.tv_nsec / NSEC_PER_SEC; - _ts.tv_nsec %= NSEC_PER_SEC; - } - - ts = &_ts; + if (sigmask != NULL) { + data.ss = (__kernel_ulong_t) sigmask; + data.ss_len = __SYSCALL_SIGSET_T_SIZE; + + sigmask = (void *)&data; } - /* The pselect6 syscall API is strange. It wants a 7th arg to be - * the sizeof(*sigmask). However syscalls with > 6 arguments aren't - * supported on linux. So arguments 6 and 7 are stuffed in a struct - * and a pointer to that struct is passed as the 6th argument to - * the syscall. - * Glibc stuffs arguments 6 and 7 in a ulong[2]. Linux reads - * them as if there were a struct { sigset_t*; size_t } in - * userspace. There woudl be trouble if userspace and the kernel are - * compiled differently enough that size_t isn't the same as ulong, - * but not enough to trigger the compat layer in linux. I can't - * think of such a case, so I'm using linux's struct. - * Furthermore Glibc sets the sigsetsize to _NSIG/8. However linux - * checks for sizeof(sigset_t), which internally is a ulong array. - * This means that if _NSIG isn't a multiple of BITS_PER_LONG then - * linux will refuse glibc's value. So I prefer sizeof(sigset_t) for - * the value of sigsetsize. - */ - struct { - const sigset_t *sigmask; - size_t sigsetsize; - } args67 = { - sigmask, - sizeof(sigset_t), - }; - - return INLINE_SYSCALL(pselect6, 6, nfds, readfds, writefds, exceptfds, ts, &args67); + return INLINE_SYSCALL(pselect6, 6, nfds, readfds, writefds, exceptfds, timeout, sigmask); #else struct timeval tval; int retval; diff --git a/test/unistd/tst-pselect.c b/test/unistd/tst-pselect.c new file mode 100644 index 0000000..cab9451 --- /dev/null +++ b/test/unistd/tst-pselect.c @@ -0,0 +1,51 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> +#include <signal.h> +#include <sys/types.h> +#include <sys/select.h> + +// our SIGALRM handler +void handler(int signum) { + (void)signum; + puts("got signal\n"); +} + +static int +do_test (void) +{ + int rc; + sigset_t wait_mask, mask_sigchld; + struct sigaction act; + + // block SIGALRM. We want to handle it only when we're ready + sigemptyset(&mask_sigchld); + sigaddset(&mask_sigchld, SIGALRM); + sigprocmask(SIG_BLOCK, &mask_sigchld, &wait_mask); + sigdelset(&wait_mask, SIGALRM); + + // register a signal handler so we can see when the signal arrives + memset(&act, 0, sizeof(act)); + sigemptyset(&act.sa_mask); // just in case an empty set isn't all 0's (total paranoia) + act.sa_handler = handler; + sigaction(SIGALRM, &act, NULL); + + // send ourselves a SIGARLM. It will pend until we unblock that signal in pselect() + printf("sending ourselves a signal\n"); + kill(getpid(), SIGALRM); + + printf("signal is pending; calling pselect()\n"); + rc = pselect(0, NULL, NULL, NULL, NULL, &wait_mask); + if (rc != -1 || errno != EINTR) { + int e = errno; + printf("pselect() returned %d, errno %d (%s)\n", rc, e, strerror(e)); + exit(1); + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include <test-skeleton.c> -- 1.8.5.6

9 years, 2 months

[PATCH] test/Test.mak: Properly define MAKE_SRCS variable

by Leonid Lisovskiy

Fix typo in d81e53c5fa "New test targets 'compile' and 'run'" commit, MAKE_SRCS variable was never defined. Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- test/Test.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Test.mak b/test/Test.mak index a82505f..98939e7 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -116,7 +116,7 @@ compile: $(COMPILE_TARGETS) G_TARGET_SRCS := $(addsuffix .c,$(G_TARGETS)) U_TARGET_SRCS := $(addsuffix .c,$(U_TARGETS)) -$(MAKE_SRCS): Makefile $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak +MAKE_SRCS := Makefile $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak $(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) $(showlink) -- 1.8.5.6

9 years, 2 months

[PATCH] __ARCH_HAS_DEPRECATED_SYSCALLS__ case fix. getdents is deprecated.

by Yoshinori Sato

Signed-off-by: Yoshinori Sato <ysato(a)users.sourceforge.jp> --- libc/sysdeps/linux/common/getdents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index b65524e..8f371eb 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -91,7 +91,7 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes) const size_t size_diff = (offsetof (struct dirent, d_name) - offsetof (struct kernel_dirent, d_name)); -# ifdef __ARCH_HAS_DEPRECATED_SYSCALLS__ +# ifndef __ARCH_HAS_DEPRECATED_SYSCALLS__ red_nbytes = MIN (nbytes - ((nbytes / (offsetof (struct dirent, d_name) + 14)) * size_diff), nbytes - size_diff); -- 2.6.1

9 years, 2 months

[PATCH] h8300: vfork flags update.

by Yoshinori Sato

Signed-off-by: Yoshinori Sato <ysato(a)users.sourceforge.jp> --- libc/sysdeps/linux/h8300/vfork.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/h8300/vfork.S b/libc/sysdeps/linux/h8300/vfork.S index 1c70dd2..24370df 100644 --- a/libc/sysdeps/linux/h8300/vfork.S +++ b/libc/sysdeps/linux/h8300/vfork.S @@ -56,7 +56,7 @@ done: jmp @er2 vfork_args: - .long 0x80004100 /* CLONE_VFORK | CLONE_VM | SIGCHLD */ + .long 0x00004111 /* CLONE_VFORK | CLONE_VM | SIGCHLD */ .long 0 .long 0 .long 0 -- 2.6.1

9 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel