zeus review request
cover zeus review request
Please review these next set of changes for zeus.
Thanks,
Anuj
The following changes since commit ee95a399285abbde84e0148ca957b59d65bcad0a:
mesa: fix meson configure fix when 'dri' is excluded from PACKAGECONFIG (2020-05-29 08:32:44 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib stable/zeus-next
Alexander Kanavin (2):
python3: make gdbm optional
python3: un-break disabling the readline PACKAGECONFIG
Lee Chee Yang (1):
qemu: fix CVE-2020-10702 & CVE-2020-13765
Lili Li (1):
kernel.bbclass: Fix Module.symvers support
Peter Kjellerstedt (1):
relocatable.bbclass: Avoid an exception if an empty pkgconfig dir
exist
Richard Leitner (1):
kernel-fitimage: introduce FIT_SIGN_ALG
haiqing (2):
gnutls: fixed CVE-2020-13777
libpam: Remove option 'obscure' from common-password
jason.lau (1):
libjpeg-turbo: Fix CVE-2020-13790
[email protected] (1):
nfs-utils: fix CVE-2019-3689
meta/classes/kernel-fitimage.bbclass | 6 +- meta/classes/kernel.bbclass | 2 +- meta/classes/relocatable.bbclass | 20 +-- ...atd-take-user-id-from-var-lib-nfs-sm.patch | 102 +++++++++++++ .../nfs-utils/nfs-utils_2.4.1.bb | 1 + ...report-missing-dependencies-for-disa.patch | 31 ++++ ...tutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.7.7.bb | 19 ++- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2020-10702.patch | 52 +++++++ .../qemu/qemu/CVE-2020-13765.patch | 48 ++++++ .../pam/libpam/pam.d/common-password | 5 +- ...buf-overrun-caused-by-bad-binary-PPM.patch | 81 +++++++++++ .../jpeg/libjpeg-turbo_2.0.3.bb | 1 + .../gnutls/gnutls/CVE-2020-13777-a.patch | 90 ++++++++++++ .../gnutls/gnutls/CVE-2020-13777-b.patch | 137 ++++++++++++++++++ .../gnutls/gnutls/CVE-2020-13777-c.patch | 68 +++++++++ meta/recipes-support/gnutls/gnutls_3.6.13.bb | 3 + 18 files changed, 650 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-take-user-id-from-var-lib-nfs-sm.patch create mode 100644 meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13765.patch create mode 100644 meta/recipes-graphics/jpeg/files/0001-rdppm.c-Fix-buf-overrun-caused-by-bad-binary-PPM.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-a.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-b.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-c.patch
Signature · 1 line
2.25.4
PATCH 1/10 nfs-utils: fix CVE-2019-3689
From: "[email protected]" <[email protected]>
Fix CVE-2019-3689
--- ...atd-take-user-id-from-var-lib-nfs-sm.patch | 102 ++++++++++++++++++ .../nfs-utils/nfs-utils_2.4.1.bb | 1 + 2 files changed, 103 insertions(+) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-take-user-id-from-var-lib-nfs-sm.patch
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-take-user-id-from-var-lib-nfs-sm.patch new file +102 -0
@@ -0,0 +1,102 @@ +From 12ee0ff1120a6e42b67cc90ad7d5006555e866c3 Mon Sep 17 00:00:00 2001 +From: NeilBrown <[email protected]> +Date: Tue, 23 Jun 2020 09:22:22 +0000 +Subject: [PATCH] statd: take user-id from /var/lib/nfs/sm + +Having /var/lib/nfs writeable by statd is not ideal +as there are files in there that statd doesn't need +to access. +After dropping privs, statd and sm-notify only need to +access files in the directories sm and sm.bak. +So take the uid for these deamons from 'sm'. + +Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=fee2cc29e888f2ced6a76990923aef19d326dc0e] +CVE: CVE-2019-3689 + +Signed-off-by: NeilBrown <[email protected]> +Signed-off-by: Steve Dickson <[email protected]> +Signed-off-by: Wenlin Kang <[email protected]> +--- + support/nsm/file.c | 16 +++++----------- + utils/statd/sm-notify.man | 10 +++++++++- + utils/statd/statd.man | 10 +++++++++- + 3 files changed, 23 insertions(+), 13 deletions(-) + +diff --git a/support/nsm/file.c b/support/nsm/file.c +index 0b66f12..f5b4480 100644 +--- a/support/nsm/file.c ++++ b/support/nsm/file.c +@@ -388,23 +388,17 @@ nsm_drop_privileges(const int pidfd) + + (void)umask(S_IRWXO); + +- /* +- * XXX: If we can't stat dirname, or if dirname is owned by +- * root, we should use "statduser" instead, which is set up +- * by configure.ac. Nothing in nfs-utils seems to use +- * "statduser," though. +- */ +- if (lstat(nsm_base_dirname, &st) == -1) { +- xlog(L_ERROR, "Failed to stat %s: %m", nsm_base_dirname); +- return false; +- } +- + if (chdir(nsm_base_dirname) == -1) { + xlog(L_ERROR, "Failed to change working directory to %s: %m", + nsm_base_dirname); + return false; + } + ++ if (lstat(NSM_MONITOR_DIR, &st) == -1) { ++ xlog(L_ERROR, "Failed to stat %s/%s: %m", nsm_base_dirname, NSM_MONITOR_DIR); ++ return false; ++ } ++ + if (!prune_bounding_set()) + return false; + +diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man +index cfe1e4b..addf5d3 100644 +--- a/utils/statd/sm-notify.man ++++ b/utils/statd/sm-notify.man +@@ -190,7 +190,15 @@ by default. + After starting, + .B sm-notify + attempts to set its effective UID and GID to the owner +-and group of this directory. ++and group of the subdirectory ++.B sm ++of this directory. After changing the effective ids, ++.B sm-notify ++only needs to access files in ++.B sm ++and ++.B sm.bak ++within the state-directory-path. + .TP + .BI -v " ipaddr " | " hostname + Specifies the network address from which to send reboot notifications, +diff --git a/utils/statd/statd.man b/utils/statd/statd.man +index 71d5846..6222701 100644 +--- a/utils/statd/statd.man ++++ b/utils/statd/statd.man +@@ -259,7 +259,15 @@ by default. + After starting, + .B rpc.statd + attempts to set its effective UID and GID to the owner +-and group of this directory. ++and group of the subdirectory ++.B sm ++of this directory. After changing the effective ids, ++.B rpc.statd ++only needs to access files in ++.B sm ++and ++.B sm.bak ++within the state-directory-path. + .TP + .BR -v ", " -V ", " --version + Causes +-- +2.23.0 +
meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb +1 -0
@@ -34,6 +34,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ file://0001-Fix-include-order-between-config.h-and-stat.h.patch \ file://0001-Disable-statx-if-using-glibc-emulation.patch \ + file://0001-statd-take-user-id-from-var-lib-nfs-sm.patch \ " SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch"
Signature · 1 line
2.25.4
PATCH 2/10 python3: make gdbm optional
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
The use case is building a gpl3-free image, without having to rely on outdated recipes from meta-gplv2 layer.
--- ...report-missing-dependencies-for-disa.patch | 31 +++++++++++++++++++ ...tutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.7.7.bb | 18 ++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch new file +31 -0
@@ -0,0 +1,31 @@ +From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 7 Oct 2019 13:22:14 +0200 +Subject: [PATCH] setup.py: do not report missing dependencies for disabled + modules + +Reporting those missing dependencies is misleading as the modules would not +have been built anyway. This particularly matters in oe-core's automated +build completeness checker which relies on the report. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + setup.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/setup.py b/setup.py +index 4b53668..0097643 100644 +--- a/setup.py ++++ b/setup.py +@@ -365,6 +365,10 @@ class PyBuildExt(build_ext): + print("%-*s %-*s %-*s" % (longest, e, longest, f, + longest, g)) + ++ # There is no need to report missing module dependencies, ++ # if the modules have been disabled in the first place. ++ missing = list(set(missing) - set(sysconf_dis)) ++ + if missing: + print() + print("Python build finished successfully!")
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +1 -1
@@ -1,4 +1,4 @@ -From 6229502e5ae6cbb22240594f002638e9ef78f831 Mon Sep 17 00:00:00 2001 +From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes
meta/recipes-devtools/python/python3_3.7.7.bb +14 -4
@@ -28,6 +28,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://reformat_sysconfig.py \ file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ + file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ "
@@ -67,7 +68,7 @@ ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config" ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" -DEPENDS = "bzip2-replacement-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" +DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" DEPENDS_append_class-target = " python3-native" DEPENDS_append_class-nativesdk = " python3-native"
@@ -92,13 +93,22 @@ python() { d.setVar('PACKAGECONFIG_PGO', '') } -PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO}" -PACKAGECONFIG_class-native ??= "readline" -PACKAGECONFIG_class-nativesdk ??= "readline" +PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO} gdbm" +PACKAGECONFIG_class-native ??= "readline gdbm" +PACKAGECONFIG_class-nativesdk ??= "readline gdbm" PACKAGECONFIG[readline] = ",,readline" # Use profile guided optimisation by running PyBench inside qemu-user PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" PACKAGECONFIG[tk] = ",,tk" +PACKAGECONFIG[gdbm] = ",,gdbm" + +do_configure_prepend () { + mkdir -p ${B}/Modules + cat > ${B}/Modules/Setup.local << EOF +*disabled* +${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} +EOF +} CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid"
Signature · 1 line
2.25.4
PATCH 3/10 python3: un-break disabling the readline PACKAGECONFIG
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
Previously the readline module would have been built regardless of readline's presence in the sysroot, and the recipe would fail at package_qa.
--- meta/recipes-devtools/python/python3_3.7.7.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/python/python3_3.7.7.bb +1 -0
@@ -107,6 +107,7 @@ do_configure_prepend () { cat > ${B}/Modules/Setup.local << EOF *disabled* ${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} +${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} EOF }
Signature · 1 line
2.25.4
PATCH 4/10 libjpeg-turbo: Fix CVE-2020-13790
In reply to Anuj MittalFrom: "jason.lau" <[email protected]>
libjpeg-turbo 2.0.4 has a heap-based buffer over-read in get_rgb_row() in rdppm.c via a malformed PPM input file.
Upstream-Status: Backport
[https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d11d4b90f4a47136467053eb2d09a]
CVE:CVE-2020-13790
--- ...buf-overrun-caused-by-bad-binary-PPM.patch | 81 +++++++++++++++++++ .../jpeg/libjpeg-turbo_2.0.3.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-graphics/jpeg/files/0001-rdppm.c-Fix-buf-overrun-caused-by-bad-binary-PPM.patch
meta/recipes-graphics/jpeg/files/0001-rdppm.c-Fix-buf-overrun-caused-by-bad-binary-PPM.patch new file +81 -0
@@ -0,0 +1,81 @@ +From ade1818b7542ef9e11ece5ce98df91fab45d674c Mon Sep 17 00:00:00 2001 +From: DRC <[email protected]> +Date: Tue, 2 Jun 2020 14:15:37 -0500 +Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM + +This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to +include binary PPM files with maximum values < 255, thus preventing a +malformed binary PPM input file with those specifications from +triggering an overrun of the rescale array and potentially crashing +cjpeg, TJBench, or any program that uses the tjLoadImage() function. + +Fixes #433 + +CVE: CVE-2020-13790 + +Signed-off-by: Liu Haitao <[email protected]> +--- + ChangeLog.md | 20 ++++++++++++++++---- + rdppm.c | 4 ++-- + 2 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog.md b/ChangeLog.md +index 3667d12..198c7b8 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -1,3 +1,15 @@ ++2.0.4 ++===== ++ ++### Significant changes relative to 2.0.3: ++ ++1. Fixed an issue in the PPM reader that caused a buffer overrun in cjpeg, ++TJBench, or the `tjLoadImage()` function if one of the values in a binary ++PPM/PGM input file exceeded the maximum value defined in the file's header and ++that maximum value was less than 255. libjpeg-turbo 1.5.0 already included a ++similar fix for binary PPM/PGM files with maximum values greater than 255. ++ ++ + 2.0.3 + ===== + +@@ -520,10 +532,10 @@ application was linked against. + + 3. Fixed a couple of issues in the PPM reader that would cause buffer overruns + in cjpeg if one of the values in a binary PPM/PGM input file exceeded the +-maximum value defined in the file's header. libjpeg-turbo 1.4.2 already +-included a similar fix for ASCII PPM/PGM files. Note that these issues were +-not security bugs, since they were confined to the cjpeg program and did not +-affect any of the libjpeg-turbo libraries. ++maximum value defined in the file's header and that maximum value was greater ++than 255. libjpeg-turbo 1.4.2 already included a similar fix for ASCII PPM/PGM ++files. Note that these issues were not security bugs, since they were confined ++to the cjpeg program and did not affect any of the libjpeg-turbo libraries. + + 4. Fixed an issue whereby attempting to decompress a JPEG file with a corrupt + header using the `tjDecompressToYUV2()` function would cause the function to +diff --git a/rdppm.c b/rdppm.c +index 87bc330..a8507b9 100644 +--- a/rdppm.c ++++ b/rdppm.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2009 by Bill Allombert, Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2015-2017, D. R. Commander. ++ * Copyright (C) 2015-2017, 2020, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) + /* On 16-bit-int machines we have to be careful of maxval = 65535 */ + source->rescale = (JSAMPLE *) + (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, +- (size_t)(((long)maxval + 1L) * ++ (size_t)(((long)MAX(maxval, 255) + 1L) * + sizeof(JSAMPLE))); + half_maxval = maxval / 2; + for (val = 0; val <= (long)maxval; val++) { +-- +2.17.0 +
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb +1 -0
@@ -12,6 +12,7 @@ DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ + file://0001-rdppm.c-Fix-buf-overrun-caused-by-bad-binary-PPM.patch \ " SRC_URI[md5sum] = "bd07fddf26f9def7bab02739eb655116"
Signature · 1 line
2.25.4
PATCH 5/10 qemu: fix CVE-2020-10702 & CVE-2020-13765
In reply to Anuj MittalFrom: Lee Chee Yang <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2020-10702.patch | 52 +++++++++++++++++++ .../qemu/qemu/CVE-2020-13765.patch | 48 +++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13765.patch
meta/recipes-devtools/qemu/qemu.inc +2 -0
@@ -37,6 +37,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-7039-3.patch \ file://CVE-2020-7211.patch \ file://CVE-2020-11869.patch \ + file://CVE-2020-13765.patch \ + file://CVE-2020-10702.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch new file +52 -0
52 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2020-13765.patch new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 6/10 gnutls: fixed CVE-2020-13777
In reply to Anuj MittalFrom: haiqing <[email protected]>
GnuTLS 3.6.x before 3.6.14 uses incorrect cryptography for encrypting a session ticket
Backport the patch from upstream:
https://gitlab.com/gnutls/gnutls.git
commit c2646aeee94e71cb15c90a3147cf3b5b0ca158ca
commit 50ad8778a81f9421effa4c5a3b457f98e559b178
commit 3d7fae761e65e9d0f16d7247ee8a464d4fe002da
--- .../gnutls/gnutls/CVE-2020-13777-a.patch | 90 ++++++++++++ .../gnutls/gnutls/CVE-2020-13777-b.patch | 137 ++++++++++++++++++ .../gnutls/gnutls/CVE-2020-13777-c.patch | 68 +++++++++ meta/recipes-support/gnutls/gnutls_3.6.13.bb | 3 + 4 files changed, 298 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-a.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-b.patch create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-13777-c.patch
meta/recipes-support/gnutls/gnutls/CVE-2020-13777-a.patch new file +90 -0
@@ -0,0 +1,90 @@ +From 6e798091d057de6b7f94b9dede4c5c919ec41f89 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <[email protected]> +Date: Tue, 2 Jun 2020 20:53:11 +0200 +Subject: [PATCH 1/3] stek: differentiate initial state from valid time window + of TOTP + +commit c2646aeee94e71cb15c90a3147cf3b5b0ca158ca from https://gitlab.com/gnutls/gnutls.git + +There was a confusion in the TOTP implementation in stek.c. When the +mechanism is initialized at the first time, it records the timestamp +but doesn't initialize the key. This removes the timestamp recording +at the initialization phase, so the key is properly set later. + +Upstream-Status: Backport + +Signed-off-by: Daiki Ueno <[email protected]> +Signed-off-by: Haiqing Bai <[email protected]> +--- + lib/stek.c | 17 +++++------------ + tests/resume-with-previous-stek.c | 4 ++-- + tests/tls13/prf-early.c | 8 ++++---- + 3 files changed, 11 insertions(+), 18 deletions(-) + +diff --git a/lib/stek.c b/lib/stek.c +index 2f885ce..5ab9e7d 100644 +--- a/lib/stek.c ++++ b/lib/stek.c +@@ -323,20 +323,13 @@ int _gnutls_initialize_session_ticket_key_rotation(gnutls_session_t session, con + if (unlikely(session == NULL || key == NULL)) + return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); + +- if (session->key.totp.last_result == 0) { +- int64_t t; +- memcpy(session->key.initial_stek, key->data, key->size); +- t = totp_next(session); +- if (t < 0) +- return gnutls_assert_val(t); ++ if (unlikely(session->key.totp.last_result != 0)) ++ return GNUTLS_E_INVALID_REQUEST; + +- session->key.totp.last_result = t; +- session->key.totp.was_rotated = 0; +- +- return GNUTLS_E_SUCCESS; +- } ++ memcpy(session->key.initial_stek, key->data, key->size); + +- return GNUTLS_E_INVALID_REQUEST; ++ session->key.totp.was_rotated = 0; ++ return 0; + } + + /* +diff --git a/tests/resume-with-previous-stek.c b/tests/resume-with-previous-stek.c +index f212b18..05c1c90 100644 +--- a/tests/resume-with-previous-stek.c ++++ b/tests/resume-with-previous-stek.c +@@ -196,8 +196,8 @@ static void server(int fd, unsigned rounds, const char *prio) + serverx509cred = NULL; + } + +- if (num_stek_rotations != 2) +- fail("STEK should be rotated exactly twice (%d)!\n", num_stek_rotations); ++ if (num_stek_rotations != 3) ++ fail("STEK should be rotated exactly three times (%d)!\n", num_stek_rotations); + + if (serverx509cred) + gnutls_certificate_free_credentials(serverx509cred); +diff --git a/tests/tls13/prf-early.c b/tests/tls13/prf-early.c +index 414b1db..bc31962 100644 +--- a/tests/tls13/prf-early.c ++++ b/tests/tls13/prf-early.c +@@ -123,10 +123,10 @@ static void dump(const char *name, const uint8_t *data, unsigned data_size) + } \ + } + +-#define KEY_EXP_VALUE "\xc0\x1e\xc2\xa4\xb7\xb4\x04\xaa\x91\x5d\xaf\xe8\xf7\x4d\x19\xdf\xd0\xe6\x08\xd6\xb4\x3b\xcf\xca\xc9\x32\x75\x3b\xe3\x11\x19\xb1\xac\x68" +-#define HELLO_VALUE "\x77\xdb\x10\x0b\xe8\xd0\xb9\x38\xbc\x49\xe6\xbe\xf2\x47\x2a\xcc\x6b\xea\xce\x85\x04\xd3\x9e\xd8\x06\x16\xad\xff\xcd\xbf\x4b" +-#define CONTEXT_VALUE "\xf2\x17\x9f\xf2\x66\x56\x87\x66\xf9\x5c\x8a\xd7\x4e\x1d\x46\xee\x0e\x44\x41\x4c\xcd\xac\xcb\xc0\x31\x41\x2a\xb6\xd7\x01\x62" +-#define NULL_CONTEXT_VALUE "\xcd\x79\x07\x93\xeb\x96\x07\x3e\xec\x78\x90\x89\xf7\x16\x42\x6d\x27\x87\x56\x7c\x7b\x60\x2b\x20\x44\xd1\xea\x0c\x89\xfb\x8b" ++#define KEY_EXP_VALUE "\xc1\x6b\x6c\xb9\x88\x33\xd5\x28\x80\xec\x27\x87\xa2\x6f\x4b\xd0\x01\x5e\x7f\xca\xd7\xd4\x8a\x3f\xe2\x48\x92\xef\x02\x14\xfb\x81\x90\x04" ++#define HELLO_VALUE "\x2a\x73\xd9\x74\x04\x4e\x0a\x5f\x41\x8a\x09\xcb\x45\x33\x1a\xec\xd3\xfc\xdc\x1b\x2c\x67\x26\xe4\x9c\xfe\x1f\xa5\x74\xf1\x4f" ++#define CONTEXT_VALUE "\x87\xf6\x88\xe3\xd7\xf2\x05\xbc\xa4\x10\xa3\x48\x9f\xf5\xcf\x97\x06\x22\x4e\xfd\x18\x32\x52\x1d\xbd\x26\xf5\x5b\x21\x20\xec" ++#define NULL_CONTEXT_VALUE "\xf9\xca\xfe\x45\x44\x96\xdb\xc5\x41\x8f\x7e\x8e\xd7\xb0\x7d\x19\x45\xaf\x09\xbc\x1e\x82\x94\xac\x55\xe5\xb9\xb4\x3b\xe8\xc0" + + static int handshake_callback_called; + +-- +2.17.1 +
meta/recipes-support/gnutls/gnutls/CVE-2020-13777-b.patch new file +137 -0
137 lines not on this page · raw message
meta/recipes-support/gnutls/gnutls/CVE-2020-13777-c.patch new file +68 -0
68 lines not on this page · raw message
meta/recipes-support/gnutls/gnutls_3.6.13.bb +3 -0
@@ -19,6 +19,9 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ file://arm_eabi.patch \ + file://CVE-2020-13777-a.patch \ + file://CVE-2020-13777-b.patch \ + file://CVE-2020-13777-c.patch \ " SRC_URI[md5sum] = "bb1fe696a11543433785b4fc70ca225f"
Signature · 1 line
2.25.4
PATCH 7/10 kernel-fitimage: introduce FIT_SIGN_ALG
In reply to Anuj MittalFrom: Richard Leitner <[email protected]>
make fitImage configuration signature algorithm selectable with FIT_SIGN_ALG.
(From OE-Core rev: e24b27a2b49e97cec6153f2d642d17a901b8ba12)
--- meta/classes/kernel-fitimage.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/classes/kernel-fitimage.bbclass +5 -1
@@ -53,6 +53,9 @@ UBOOT_MKIMAGE_DTCOPTS ??= "" # fitImage Hash Algo FIT_HASH_ALG ?= "sha256" +# fitImage Signature Algo +FIT_SIGN_ALG ?= "rsa2048" + # # Emit the fitImage ITS header #
@@ -246,6 +249,7 @@ EOF fitimage_emit_section_config() { conf_csum="${FIT_HASH_ALG}" + conf_sign_algo="${FIT_SIGN_ALG}" if [ -n "${UBOOT_SIGN_ENABLE}" ] ; then conf_sign_keyname="${UBOOT_SIGN_KEYNAME}" fi
@@ -327,7 +331,7 @@ EOF cat << EOF >> ${1} signature@1 { - algo = "${conf_csum},rsa2048"; + algo = "${conf_csum},${conf_sign_algo}"; key-name-hint = "${conf_sign_keyname}"; ${sign_line} };
Signature · 1 line
2.25.4
PATCH 8/10 kernel.bbclass: Fix Module.symvers support
In reply to Anuj MittalFrom: Lili Li <[email protected]>
Starting from v5.8-rc1 commit 269a535ca931 (modpost: generate vmlinux.symvers and reuse it for the second modpost"), kernel will generate new vmlinux.symvers instead of dumping all the vmlinux symbols into Module.symvers in the first pass.
Error log:
'run.do_shared_workdir.16614' failed with exit code 1:
DEBUG: cp: cannot stat 'Module.symvers': No such file or directory
This change will check the file Module.symvers existence before copying it.
--- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel.bbclass +1 -1
@@ -452,7 +452,7 @@ do_shared_workdir () { # Copy files required for module builds cp System.map $kerneldir/System.map-${KERNEL_VERSION} - cp Module.symvers $kerneldir/ + [ -e Module.symvers ] && cp Module.symvers $kerneldir/ cp .config $kerneldir/ mkdir -p $kerneldir/include/config cp include/config/kernel.release $kerneldir/include/config/kernel.release
Signature · 1 line
2.25.4
PATCH 9/10 relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist
In reply to Anuj MittalFrom: Peter Kjellerstedt <[email protected]>
Rewrite relocatable_native_pcfiles() so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.
--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
meta/classes/relocatable.bbclass +11 -9
@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc - fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc - fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if any files were found + if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir ${base_prefix}) + sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files + fi + done }
Signature · 1 line
2.25.4
PATCH 10/10 libpam: Remove option 'obscure' from common-password
In reply to Anuj MittalFrom: haiqing <[email protected]>
libpam does not support 'obscure' checks to password, there are the same checks in pam_cracklib module. And this fix can remove the below error message while updating password with 'passwd':
pam_unix(passwd:chauthtok):unrecognized option[obscure]
--- meta/recipes-extended/pam/libpam/pam.d/common-password | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
meta/recipes-extended/pam/libpam/pam.d/common-password +1 -4
@@ -10,13 +10,10 @@ # The "sha512" option enables salted SHA512 passwords. Without this option, # the default is Unix crypt. Prior releases used the option "md5". # -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# # See the pam_unix manpage for other options. # here are the per-package modules (the "Primary" block) -password [success=1 default=ignore] pam_unix.so obscure sha512 +password [success=1 default=ignore] pam_unix.so sha512 # here's the fallback if no module succeeds password requisite pam_deny.so # prime the stack with a positive return value if there isn't one already;
Signature · 1 line
2.25.4
✗ patchtest: failure for zeus review request (rev3)
In reply to Anuj Mittal== Series Details ==
Series: zeus review request (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/23013/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch [zeus,06/10] gnutls: fixed CVE-2020-13777 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX"
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-graphics/jpeg/files/0001-rdppm.c-Fix-buf-overrun-caused-by-bad-binary-PPM.patch Standard format Upstream-Status: <Valid status> Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
Re: [OE-core] [zeus][PATCH 08/10] kernel.bbclass: Fix Module.symvers support
In reply to Anuj MittalPlease drop this patch:
https://lists.openembedded.org/g/openembedded-core/message/140233
cu
Adrian
Re: [OE-core] [zeus][PATCH 08/10] kernel.bbclass: Fix Module.symvers support
Quoted 2 lines · Adrian Bunk
Please drop this patch:
https://lists.openembedded.org/g/openembedded-core/message/140233
Later in that thread Bruce did change his opinion although this is a tricky one...
Cheers,
Richard
Re: [OE-core] [zeus][PATCH 08/10] kernel.bbclass: Fix Module.symvers support
In reply to Adrian BunkHi Adrian,
Quoted 3 lines · Adrian Bunk
Please drop this patch:
https://lists.openembedded.org/g/openembedded-core/message/140233
Thank for reviewing the series. I believe this was resolved by
https://lists.openembedded.org/g/openembedded-core/message/140237
?
Thanks,
Anuj
Re: [OE-core] [zeus][PATCH 09/10] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist
In reply to Anuj MittalQuoted 6 lines · Anuj Mittal
From: Peter Kjellerstedt <[email protected]>
Rewrite
relocatable_native_pcfiles()so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.
This seems to be causing build failures for libnsl2-native:
| ../../git/src/yp_xdr.c:38:23: fatal error: netconfig.h: No such
file or directory
| #include <netconfig.h> | ^ | compilation terminated.
The header is there under recipe-sysroot-native/usr/include/tirpc/netconfig.h, so It looks like this patch somehow breaks libnsl2-native's ability to find or use libtirpc.pc
Quoted 41 lines
Signed-off-by Peter Kjellerstedt <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit f9c5df6dc1c13e9b05ff1b47ad84ad339f6779a4)Signed-off-by Anuj Mittal <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)meta/classes/relocatable.bbclass +11
-10@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc - fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc - fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if any files were found + if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir ${base_prefix}) + sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files + fi + done } --2.25.4