glibc:aaribaud/y2038-submitted-v1

Last commit made on 2018-06-13
Get this branch:
git clone -b aaribaud/y2038-submitted-v1 https://git.launchpad.net/glibc

Branch merges

Branch information

Name:
aaribaud/y2038-submitted-v1
Repository:
lp:glibc

Recent commits

f3c5237... by "Albert ARIBAUD \(3ADEV\)" <albert.aribaud@3adev.fr> on 2018-05-02

Y2038: make __mktime_internal compatible with 64-bit-time

This implies that its callers be 64-bit-time compatible too.
It is done by creating 64-bit-time versions of these and
turning their original 32-bit-time versions into wrappers
(at a slight execution time cost).

The callers affected are:

      * mktime
      * timelocal (as an alias of mktime)
      * timegm

fd05472... by "Albert ARIBAUD \(3ADEV\)" <albert.aribaud@3adev.fr> on 2018-04-11

Y2038: make __tz_convert compatible with 64-bit-time

This implies that its callers be 64-bit-time compatible too.
It is done by creating 64-bit-time versions of these and
turning their original 32-bit-time versions into wrappers
(at a slight execution time cost).

The callers affected are:

  * localtime
  * localtime_r
  * ctime
  * ctime_r
  * gmtime
  * gmtime_r

Note that in time/tzfile.c we do not need to check for time_t
overflows anymore as introduced by commit fc79706a323 since we
now use internal_time_t.

31c83d4... by "Albert ARIBAUD \(3ADEV\)" <albert.aribaud@3adev.fr> on 2017-09-07

Y2038: add type __time64_t

This type is public, so that time_t can be a typedef of it
when we switch the public API to 64-bit time.

Also, provide a function to check if a __time64_t value
fits in a (32-bit) __time_t.

a745c83... by Carlos-0 on 2018-06-13

Fix comments in _dl_dst_count and _dl_dst_substitute.

The comments in _dl_dst_count is adjusted to match what the code does
which is count DSTs from the start of the string. With the removal of
DL_DST_COUNT we no longer accept an input that starts at the first $.

In _dl_dst_substitute we adjust the comment to indicate that both
conditions must be true for the SUID/SGID $ORIGIN exception.

35df5a7... by Carlos-0 on 2018-06-12

Fix fallback path in __pthread_mutex_timedlock ().

Fix the typo in the fallback path in __pthread_mutex_timedlock ()
whic hcalls lll_futex_timed_wait (). This is only useful for cases
where the patch is being backported to older distributions where
only lll_futex_timed_wait () is available.

48b12ed... by Joseph Myers <email address hidden> on 2018-06-12

Do not use const attribute for nan functions (bug 23277).

As in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86113 for
__builtin_nan, bits/mathcalls.h wrongly declares the nan function with
the __const__ attribute. Because the function reads memory pointed to
by an argument, it's only pure, not const. This patch removes the
incorrect attribute and adds a testcase for the bug. No __pure__
attribute is added to replace the incorrect __const__ one, since that
would introduce problems when using GCC versions that have the
incorrect built-in __const__ attribute and warn for the combination of
those two attributes.

Tested for x86_64.

 [BZ #23277]
 * math/bits/mathcalls.h [__USE_ISOC99] (nan): Do not use __const__
 attribute.
 * math/test-nan-const.c: New file.
 * math/Makefile (tests): Add test-nan-const.
 (CFLAGS-test-nan-const.c): New variable.

cb8f6af... by "H.J. Lu" <email address hidden> on 2018-06-12

benchtests: Add -f/--functions argument

On x86-64, there may be multiple IFUNC implementations for a given
function. But we may be only interested in a subset of them. This
patch adds -f/--functions argument to compare a subset of IFUNC
implementations.

 * benchtests/scripts/compare_strings.py (process_results): Add
 funcs argument. Compare only functions which are selected.
 (main): Check if base function is among selected functions.
 Pass selected functions to process_results.
 (__main__): Add -f/--functions argument.

fc2ba80... by Hongbo Zhang on 2018-06-12

aarch64: add HXT Phecda core memory operation ifuncs

Phecda is HXT semiconductor's CPU core, this patch adds memory operation
ifuncs for it: sharing the same optimized implementation with Qualcomm's
Falkor core.

2018-06-07 Minfeng Kang <email address hidden>
     Hongbo Zhang <email address hidden>

 * sysdeps/aarch64/multiarch/memcpy.c (libc_ifunc): reuse
 __memcpy_falkor for phecda core.
 * sysdeps/aarch64/multiarch/memmove.c (libc_ifunc): reuse
 __memmove_falkor for phecda core.
 * sysdeps/aarch64/multiarch/memset.c (libc_ifunc): reuse
 __memset_falkor for phecda core.
 * sysdeps/unix/sysv/linux/aarch64/cpu-features.c: add MIDR entry
 for phecda core.
 * sysdeps/unix/sysv/linux/aarch64/cpu-features.h (IS_PHECDA): add
 macro to identify phecda core.

5aad5f6... by Carlos-0 on 2018-06-06

Improve DST handling (Bug 23102, Bug 21942, Bug 18018, Bug 23259).

This commit improves DST handling significantly in the following
ways: firstly is_dst () is overhauled to correctly process DST
sequences that would be accepted given the ELF gABI. This means that
we actually now accept slightly more sequences than before. Now we
accept $ORIGIN$ORIGIN, but in the past we accepted only $ORIGIN\0 or
$ORIGIN/..., but this kind of behaviour results in unexpected
and uninterpreted DST sequences being used as literal search paths
leading to security defects. Therefore the first step in correcting
this defect is making is_dst () properly account for all DSTs
and making the function context free in the sense that it counts
DSTs without knowledge of path, or AT_SECURE. Next, _dl_dst_count ()
is also simplified to count all DSTs regardless of context.
Then in _dl_dst_substitute () we reintroduce context-dependent
processing for such things as AT_SECURE handling. At the level of
_dl_dst_substitute we can have access to things like the true start
of the string sequence to validate $ORIGIN-based paths rooted in
trusted directories. Lastly, we tighten up the accepted sequences
in AT_SECURE, and avoid leaving known unexpanded DSTs, this is
noted in the NEWS entry.

Verified with a sequence of 68 tests on x86_64 that cover
non-AT_SECURE and AT_SECURE testing using a sysroot (requires root
to run). The tests cover cases for bug 23102, bug 21942, bug 18018,
and bug 23259. These tests are not yet appropriate for the glibc
regression testsuite, but with the upcoming test-in-container testing
framework it should be possible to include these tests upstream soon.

See the mailing list for the tests:
https://www.sourceware.org/ml/libc-alpha/2018-06/msg00251.html

329ea51... by Zack Weinberg on 2018-04-03

Avoid cancellable I/O primitives in ld.so.

Neither the <dlfcn.h> entry points, nor lazy symbol resolution, nor
initial shared library load-up, are cancellation points, so ld.so
should exclusively use I/O primitives that are not cancellable. We
currently achieve this by having the cancellation hooks compile as
no-ops when IS_IN(rtld); this patch changes to using exclusively
_nocancel primitives in the source code instead, which makes the
intent clearer and significantly reduces the amount of code compiled
under IS_IN(rtld) as well as IS_IN(libc) -- in particular,
elf/Makefile no longer thinks we require a copy of unwind.c in
rtld-libc.a. (The older mechanism is preserved as a backstop.)

The bulk of the change is splitting up the files that define the
_nocancel I/O functions, so they don't also define the variants that
*are* cancellation points; after which, the existing logic for picking
out the bits of libc that need to be recompiled as part of ld.so Just
Works. I did this for all of the _nocancel functions, not just the
ones used by ld.so, for consistency.

fcntl was a little tricky because it's only a cancellation point for
certain opcodes (F_SETLKW(64), which can block), and the existing
__fcntl_nocancel wasn't applying the FCNTL_ADJUST_CMD hook, which
strikes me as asking for trouble, especially as the only nontrivial
definition of FCNTL_ADJUST_CMD (for powerpc64) changes F_*LK* opcodes.
To fix this, fcntl_common moves to fcntl_nocancel.c along with
__fcntl_nocancel, and changes its name to the extern (but hidden)
symbol __fcntl_nocancel_adjusted, so that regular fcntl can continue
calling it. __fcntl_nocancel now applies FCNTL_ADJUST_CMD; so that
both both fcntl.c and fcntl_nocancel.c can see it, the only nontrivial
definition moves from sysdeps/u/s/l/powerpc/powerpc64/fcntl.c to
.../powerpc64/sysdep.h and becomes entirely a macro, instead of a macro
that calls an inline function.

The nptl version of libpthread also changes a little, because its
"compat-routines" formerly included files that defined all the
_nocancel functions it uses; instead of continuing to duplicate them,
I exported the relevant ones from libc.so as GLIBC_PRIVATE. Since the
Linux fcntl.c calls a function defined by fcntl_nocancel.c, it can no
longer be used from libpthread.so; instead, introduce a custom
forwarder, pt-fcntl.c, and export __libc_fcntl from libc.so as
GLIBC_PRIVATE. The nios2-linux ABI doesn't include a copy of vfork()
in libpthread, and it was handling that by manipulating
libpthread-routines in .../linux/nios2/Makefile; it is cleaner to do
what other such ports do, and have a pt-vfork.S that defines no symbols.

Right now, it appears that Hurd does not implement _nocancel I/O, so
sysdeps/generic/not-cancel.h will forward everything back to the
regular functions. This changed the names of some of the functions
that sysdeps/mach/hurd/dl-sysdep.c needs to interpose.

 * elf/dl-load.c, elf/dl-misc.c, elf/dl-profile.c, elf/rtld.c
 * sysdeps/unix/sysv/linux/dl-sysdep.c
 Include not-cancel.h. Use __close_nocancel instead of __close,
 __open64_nocancel instead of __open, __read_nocancel instead of
 __libc_read, and __write_nocancel instead of __libc_write.

 * csu/check_fds.c (check_one_fd)
 * sysdeps/posix/fdopendir.c (__fdopendir)
 * sysdeps/posix/opendir.c (__alloc_dir): Use __fcntl_nocancel
        instead of __fcntl and/or __libc_fcntl.

 * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np)
 * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np)
        * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system):
 Use __open64_nocancel instead of __open_nocancel.

 * sysdeps/unix/sysv/linux/not-cancel.h: Move all of the
 hidden_proto declarations to the end and issue them if either
 IS_IN(libc) or IS_IN(rtld).
 * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines):
 Add close_nocancel, fcntl_nocancel, nanosleep_nocancel,
 open_nocancel, open64_nocancel, openat_nocancel, pause_nocancel,
 read_nocancel, waitpid_nocancel, write_nocancel.

        * io/Versions [GLIBC_PRIVATE]: Add __libc_fcntl,
        __fcntl_nocancel, __open64_nocancel, __write_nocancel.
        * posix/Versions: Add __nanosleep_nocancel, __pause_nocancel.

        * nptl/pt-fcntl.c: New file.
        * nptl/Makefile (pthread-compat-wrappers): Remove fcntl.
        (libpthread-routines): Add pt-fcntl.
        * include/fcntl.h (__fcntl_nocancel_adjusted): New function.
        (__libc_fcntl): Remove attribute_hidden.
 * sysdeps/unix/sysv/linux/fcntl.c (__libc_fcntl): Call
 __fcntl_nocancel_adjusted, not fcntl_common.
        (__fcntl_nocancel): Move to new file fcntl_nocancel.c.
 (fcntl_common): Rename to __fcntl_nocancel_adjusted; also move
 to fcntl_nocancel.c.
 * sysdeps/unix/sysv/linux/fcntl_nocancel.c: New file.
 * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Remove file.
 * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
 Define FCNTL_ADJUST_CMD here, as a self-contained macro.

 * sysdeps/unix/sysv/linux/close.c: Move __close_nocancel to...
 * sysdeps/unix/sysv/linux/close_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/nanosleep.c: Move __nanosleep_nocancel to...
 * sysdeps/unix/sysv/linux/nanosleep_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/open.c: Move __open_nocancel to...
 * sysdeps/unix/sysv/linux/open_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/open64.c: Move __open64_nocancel to...
 * sysdeps/unix/sysv/linux/open64_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/openat.c: Move __openat_nocancel to...
 * sysdeps/unix/sysv/linux/openat_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/openat64.c: Move __openat64_nocancel to...
 * sysdeps/unix/sysv/linux/openat64_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/pause.c: Move __pause_nocancel to...
 * sysdeps/unix/sysv/linux/pause_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/read.c: Move __read_nocancel to...
 * sysdeps/unix/sysv/linux/read_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/waitpid.c: Move __waitpid_nocancel to...
 * sysdeps/unix/sysv/linux/waitpid_nocancel.c: ...this new file.
 * sysdeps/unix/sysv/linux/write.c: Move __write_nocancel to...
 * sysdeps/unix/sysv/linux/write_nocancel.c: ...this new file.

        * sysdeps/unix/sysv/linux/nios2/Makefile: Don't override
        libpthread-routines.
        * sysdeps/unix/sysv/linux/nios2/pt-vfork.S: New file which
        defines nothing.

        * sysdeps/mach/hurd/dl-sysdep.c: Define __read instead of
        __libc_read, and __write instead of __libc_write. Define
        __open64 in addition to __open.