diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-core/glibc | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/glibc')
4 files changed, 0 insertions, 324 deletions
diff --git a/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch b/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch deleted file mode 100644 index a458a2a22..000000000 --- a/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 75a193b7611bade31a150dfcc528b973e3d46231 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Mon, 2 Nov 2020 16:18:29 -0300 -Subject: [PATCH] linux: Allow adjtime with NULL argument [BZ #26833] - -The adjtime interface allows return the amount of time remaining -from any previous adjustment that has not yet been completed by -passing a NULL as first argument. This was introduced with y2038 -support 0308077e3a. - -Checked on i686-linux-gnu. - -Reviewed-by: Lukasz Majewski <lukma@denx.de> -Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=75a193b7611bade31a150dfcc528b973e3d46231] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - sysdeps/unix/sysv/linux/adjtime.c | 11 +++++--- - time/Makefile | 3 ++- - time/tst-adjtime.c | 44 +++++++++++++++++++++++++++++++ - 3 files changed, 54 insertions(+), 4 deletions(-) - create mode 100644 time/tst-adjtime.c - -diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c -index 3f9a4ea2eb..6d1d1b6af2 100644 ---- a/sysdeps/unix/sysv/linux/adjtime.c -+++ b/sysdeps/unix/sysv/linux/adjtime.c -@@ -68,11 +68,16 @@ libc_hidden_def (__adjtime64) - int - __adjtime (const struct timeval *itv, struct timeval *otv) - { -- struct __timeval64 itv64, otv64; -+ struct __timeval64 itv64, *pitv64 = NULL; -+ struct __timeval64 otv64; - int retval; - -- itv64 = valid_timeval_to_timeval64 (*itv); -- retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL); -+ if (itv != NULL) -+ { -+ itv64 = valid_timeval_to_timeval64 (*itv); -+ pitv64 = &itv64; -+ } -+ retval = __adjtime64 (pitv64, otv != NULL ? &otv64 : NULL); - if (otv != NULL) - *otv = valid_timeval64_to_timeval (otv64); - -diff --git a/time/Makefile b/time/Makefile -index 26aa835166..f27a75a115 100644 ---- a/time/Makefile -+++ b/time/Makefile -@@ -47,7 +47,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ - tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ - tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ - tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \ -- tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 -+ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \ -+ tst-adjtime - - include ../Rules - -diff --git a/time/tst-adjtime.c b/time/tst-adjtime.c -new file mode 100644 -index 0000000000..ae2b37cdab ---- /dev/null -+++ b/time/tst-adjtime.c -@@ -0,0 +1,44 @@ -+/* Basic tests for adjtime. -+ Copyright (C) 2020 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sys/time.h> -+#include <stdlib.h> -+ -+#include <errno.h> -+#include <support/check.h> -+ -+ -+static int -+do_test (void) -+{ -+ /* Check if the interface allows getting the amount of time remaining -+ from any previous adjustment that has not yet been completed. This -+ is a non-privileged function of adjtime. */ -+ struct timeval tv; -+ int r = adjtime (NULL, &tv); -+ if (r == -1) -+ { -+ if (errno == ENOSYS) -+ FAIL_UNSUPPORTED ("adjtime unsupported"); -+ FAIL_EXIT1 ("adjtime (NULL, ...) failed: %m"); -+ } -+ -+ return 0; -+} -+ -+#include <support/test-driver.c> diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch deleted file mode 100644 index 134b4e361..000000000 --- a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 228edd356f03bf62dcf2b1335f25d43c602ee68d Mon Sep 17 00:00:00 2001 -From: Michael Colavita <mcolavita@fb.com> -Date: Thu, 19 Nov 2020 11:44:40 -0500 -Subject: [PATCH] iconv: Fix incorrect UCS4 inner loop bounds (BZ#26923) - -Previously, in UCS4 conversion routines we limit the number of -characters we examine to the minimum of the number of characters in the -input and the number of characters in the output. This is not the -correct behavior when __GCONV_IGNORE_ERRORS is set, as we do not consume -an output character when we skip a code unit. Instead, track the input -and output pointers and terminate the loop when either reaches its -limit. - -This resolves assertion failures when resetting the input buffer in a step of -iconv, which assumes that the input will be fully consumed given sufficient -output space. - -Upstream-Status: Backport [git://sourceware.org/git/glibc.git] -CVE: CVE-2020-29562 -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iconv/Makefile | 2 +- - iconv/gconv_simple.c | 16 ++++---------- - iconv/tst-iconv8.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 55 insertions(+), 13 deletions(-) - create mode 100644 iconv/tst-iconv8.c - -diff --git a/iconv/Makefile b/iconv/Makefile -index 30bf996d3a..f9b51e23ec 100644 ---- a/iconv/Makefile -+++ b/iconv/Makefile -@@ -44,7 +44,7 @@ CFLAGS-linereader.c += -DNO_TRANSLITERATION - CFLAGS-simple-hash.c += -I../locale - - tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \ -- tst-iconv7 tst-iconv-mt tst-iconv-opt -+ tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt - - others = iconv_prog iconvconfig - install-others-programs = $(inst_bindir)/iconv -diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c -index d4797fba17..963b29f246 100644 ---- a/iconv/gconv_simple.c -+++ b/iconv/gconv_simple.c -@@ -239,11 +239,9 @@ ucs4_internal_loop (struct __gconv_step *step, - int flags = step_data->__flags; - const unsigned char *inptr = *inptrp; - unsigned char *outptr = *outptrp; -- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; - int result; -- size_t cnt; - -- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) -+ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) - { - uint32_t inval; - -@@ -307,11 +305,9 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step, - int flags = step_data->__flags; - const unsigned char *inptr = *inptrp; - unsigned char *outptr = *outptrp; -- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; - int result; -- size_t cnt; - -- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) -+ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) - { - if (__glibc_unlikely (inptr[0] > 0x80)) - { -@@ -613,11 +609,9 @@ ucs4le_internal_loop (struct __gconv_step *step, - int flags = step_data->__flags; - const unsigned char *inptr = *inptrp; - unsigned char *outptr = *outptrp; -- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; - int result; -- size_t cnt; - -- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) -+ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) - { - uint32_t inval; - -@@ -684,11 +678,9 @@ ucs4le_internal_loop_unaligned (struct __gconv_step *step, - int flags = step_data->__flags; - const unsigned char *inptr = *inptrp; - unsigned char *outptr = *outptrp; -- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; - int result; -- size_t cnt; - -- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) -+ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) - { - if (__glibc_unlikely (inptr[3] > 0x80)) - { -diff --git a/iconv/tst-iconv8.c b/iconv/tst-iconv8.c -new file mode 100644 -index 0000000000..0b92b19f66 ---- /dev/null -+++ b/iconv/tst-iconv8.c -@@ -0,0 +1,50 @@ -+/* Test iconv behavior on UCS4 conversions with //IGNORE. -+ Copyright (C) 2020 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+/* Derived from BZ #26923 */ -+#include <errno.h> -+#include <iconv.h> -+#include <stdio.h> -+#include <support/check.h> -+ -+static int -+do_test (void) -+{ -+ iconv_t cd = iconv_open ("UTF-8//IGNORE", "ISO-10646/UCS4/"); -+ TEST_VERIFY_EXIT (cd != (iconv_t) -1); -+ -+ /* -+ * Convert sequence beginning with an irreversible character into buffer that -+ * is too small. -+ */ -+ char input[12] = "\xe1\x80\xa1" "AAAAAAAAA"; -+ char *inptr = input; -+ size_t insize = sizeof (input); -+ char output[6]; -+ char *outptr = output; -+ size_t outsize = sizeof (output); -+ -+ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == -1); -+ TEST_VERIFY (errno == E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv_close (cd) != -1); -+ -+ return 0; -+} -+ -+#include <support/test-driver.c> --- -2.17.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch deleted file mode 100644 index 0f54d72ca..000000000 --- a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 681900d29683722b1cb0a8e565a0585846ec5a61 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Tue, 22 Sep 2020 19:07:48 +0200 -Subject: [PATCH] x86: Harden printf against non-normal long double values (bug - 26649) - -The behavior of isnan/__builtin_isnan on bit patterns that do not -correspond to something that the CPU would produce from valid inputs -is currently under-defined in the toolchain. (The GCC built-in and -glibc disagree.) - -The isnan check in PRINTF_FP_FETCH in stdio-common/printf_fp.c -assumes the GCC behavior that returns true for non-normal numbers -which are not specified as NaN. (The glibc implementation returns -false for such numbers.) - -At present, passing non-normal numbers to __mpn_extract_long_double -causes this function to produce irregularly shaped multi-precision -integers, triggering undefined behavior in __printf_fp_l. - -With GCC 10 and glibc 2.32, this behavior is not visible because -__builtin_isnan is used, which avoids calling -__mpn_extract_long_double in this case. This commit updates the -implementation of __mpn_extract_long_double so that regularly shaped -multi-precision integers are produced in this case, avoiding -undefined behavior in __printf_fp_l. - -Upstream-Status: Backport [git://sourceware.org/git/glibc.git] -CVE: CVE-2020-29573 -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - sysdeps/i386/ldbl2mpn.c | 8 ++++ - 1 files changed, 8 insertions(+) - -diff --git a/sysdeps/i386/ldbl2mpn.c b/sysdeps/i386/ldbl2mpn.c -index ec8464eef7..23afedfb67 100644 ---- a/sysdeps/i386/ldbl2mpn.c -+++ b/sysdeps/i386/ldbl2mpn.c -@@ -115,6 +115,14 @@ __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size, - && res_ptr[N - 1] == 0) - /* Pseudo zero. */ - *expt = 0; -+ else -+ /* Unlike other floating point formats, the most significant bit -+ is explicit and expected to be set for normal numbers. Set it -+ in case it is cleared in the input. Otherwise, callers will -+ not be able to produce the expected multi-precision integer -+ layout by shifting. */ -+ res_ptr[N - 1] |= (mp_limb_t) 1 << (LDBL_MANT_DIG - 1 -+ - ((N - 1) * BITS_PER_MP_LIMB)); - - return N; - } --- -2.17.0 - diff --git a/poky/meta/recipes-core/glibc/glibc_2.32.bb b/poky/meta/recipes-core/glibc/glibc_2.32.bb index b850c28c7..2a0e46438 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.32.bb @@ -43,9 +43,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ - file://0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch \ - file://CVE-2020-29562.patch \ - file://CVE-2020-29573.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" |