zeus patch review
cover zeus patch review
Next set of changes for zeus. Please review.
Thanks,
Anuj
The following changes since commit bd3e0d724004a346921a25defa6d812d48d6108a:
openssl: update to 1.1.1f (2020-04-20 19:26:57 -0700)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/zeus
Adrian Bunk (1):
python: Upgrade 2.7.17 -> 2.17.18
Alex Kiernan (1):
gnutls: upgrade 3.6.8 -> 3.6.11.1
Alexander Kanavin (1):
gnutls: upgrade 3.6.11.1 -> 3.6.12
Changqing Li (1):
qemu: fix CVE-2020-7039
Chee Yang Lee (1):
qemu/slirp: fix CVE-2020-7211
Jan Luebbe (2):
apt-native: don't let dpkg overwrite files by default
openssl: upgrade 1.1.1f -> 1.1.1g
Jeremy Puhlman (1):
python3-native: Should not search the system for headers/libraries.
Khem Raj (1):
qemu: Replace stime() API with clock_settime
Lee Chee Yang (1):
cve-update-db-native: clean DB if temporary file exist
Li Zhou (2):
git: Security Advisory - git - CVE-2020-5260
git: Security Advisory - git - CVE-2020-11008
Martin Jansa (1):
prservice.py: fix do_package with newer Python in Ubuntu 20.04
Wang Mingyu (2):
gnupg: upgrade 2.2.17 -> 2.2.19
gnutls: upgrade 3.6.12 -> 3.6.13
Zhixiong Chi (1):
glibc: CVE-2020-1751
haiqing (1):
qemu: Add PACKAGECONFIG for glusterfs
[email protected] (1):
systemd: Fix CVE-2020-1712
meta/lib/oe/prservice.py | 4 +
.../{openssl_1.1.1f.bb => openssl_1.1.1g.bb} | 2 +-
.../glibc/glibc/CVE-2020-1751.patch | 70 +++
meta/recipes-core/glibc/glibc_2.30.bb | 1 +
.../recipes-core/meta/cve-update-db-native.bb | 9 +-
.../0001-Merge-branch-polkit-ref-count.patch | 520 ++++++++++++++++++
meta/recipes-core/systemd/systemd_243.2.bb | 1 +
meta/recipes-devtools/apt/files/apt.conf | 2 +-
meta/recipes-devtools/git/git.inc | 16 +-
...ial-use-test_i18ncmp-to-check-stderr.patch | 35 ++
...t-unrepresentable-values-when-parsin.patch | 156 ++++++
...tmodules-URLs-with-embedded-newlines.patch | 103 ++++
.../git/git/CVE-2020-11008-1.patch | 70 +++
.../git/git/CVE-2020-11008-2.patch | 292 ++++++++++
.../git/git/CVE-2020-11008-3.patch | 97 ++++
.../git/git/CVE-2020-11008-4.patch | 173 ++++++
.../git/git/CVE-2020-11008-5.patch | 211 +++++++
.../git/git/CVE-2020-11008-6.patch | 84 +++
.../git/git/CVE-2020-11008-7.patch | 206 +++++++
.../git/git/CVE-2020-11008-8.patch | 114 ++++
.../git/git/CVE-2020-11008-9.patch | 114 ++++
.../git/git/CVE-2020-5260.patch | 65 +++
...tive_2.7.17.bb => python-native_2.7.18.bb} | 0
meta/recipes-devtools/python/python.inc | 6 +-
...-search-system-for-headers-libraries.patch | 29 +
meta/recipes-devtools/python/python3_3.7.7.bb | 1 +
.../{python_2.7.17.bb => python_2.7.18.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 6 +
...linux-user-remove-host-stime-syscall.patch | 61 ++
.../qemu/qemu/CVE-2020-7039-1.patch | 44 ++
.../qemu/qemu/CVE-2020-7039-2.patch | 59 ++
.../qemu/qemu/CVE-2020-7039-3.patch | 64 +++
.../qemu/qemu/CVE-2020-7211.patch | 46 ++
.../{gnupg_2.2.17.bb => gnupg_2.2.19.bb} | 4 +-
.../gnutls/gnutls/posix-shell.patch | 39 --
.../{gnutls_3.6.8.bb => gnutls_3.6.13.bb} | 5 +-
36 files changed, 2658 insertions(+), 51 deletions(-)
rename meta/recipes-connectivity/openssl/{openssl_1.1.1f.bb => openssl_1.1.1g.bb} (98%)
create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-Merge-branch-polkit-ref-count.patch
create mode 100644 meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch
create mode 100644 meta/recipes-devtools/git/git/0002-credential-detect-unrepresentable-values-when-parsin.patch
create mode 100644 meta/recipes-devtools/git/git/0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-1.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-2.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-3.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-4.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-5.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-6.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-7.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-8.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-9.patch
create mode 100644 meta/recipes-devtools/git/git/CVE-2020-5260.patch
rename meta/recipes-devtools/python/{python-native_2.7.17.bb => python-native_2.7.18.bb} (100%)
create mode 100644 meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
rename meta/recipes-devtools/python/{python_2.7.17.bb => python_2.7.18.bb} (100%)
create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7211.patch
rename meta/recipes-support/gnupg/{gnupg_2.2.17.bb => gnupg_2.2.19.bb} (93%)
delete mode 100644 meta/recipes-support/gnutls/gnutls/posix-shell.patch
rename meta/recipes-support/gnutls/{gnutls_3.6.8.bb => gnutls_3.6.13.bb} (92%)Signature · 1 line
2.25.4
PATCH 1/18 python3-native: Should not search the system for headers/libraries.
From: Jeremy Puhlman <[email protected]>
The specific issue here is rpc/rpc.h, but its likely more general. /usr/include is searched for rpc/rpc.h and if it exists on the system, it changes behavior. If you are using the extended buildtools tarball on a machine that has /usr/include/rpc/rpc.h, it will decide that is good enough and not continue to search. nis fails to build because /usr/include and /usr/lib are not part of the include/link paths for the buildtools tarball compiler(nor should they be).
This makes it so python3-native will not build if you are using the extended buildtools tarball, but from a larger issue perspective it is building in likely different ways depending on what machine it is building on.
libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h.
(From OE-Core rev: f37dfc7907ae7bac08d40468ddde2e5b8bba030c)
--- ...-search-system-for-headers-libraries.patch | 29 +++++++++++++++++++ meta/recipes-devtools/python/python3_3.7.7.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <[email protected]> +Date: Wed, 4 Mar 2020 00:06:42 +0000 +Subject: [PATCH] Don't search system for headers/libraries + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman <[email protected]> +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9da1b3a..59782c0 100644 +--- a/setup.py ++++ b/setup.py +@@ -674,8 +674,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] +- system_include_dirs = ['/usr/include'] ++ system_lib_dirs = [] ++ system_include_dirs = [] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +-- +2.24.1 +
meta/recipes-devtools/python/python3_3.7.7.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ + file://0001-Don-t-search-system-for-headers-libraries.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
Signature · 1 line
2.25.4
PATCH 2/18 qemu: Replace stime() API with clock_settime
In reply to Anuj MittalFrom: Khem Raj <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + ...linux-user-remove-host-stime-syscall.patch | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -27,6 +27,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ + file://0011-linux-user-remove-host-stime-syscall.patch \ file://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ file://CVE-2020-1711.patch \
meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 3/18 prservice.py: fix do_package with newer Python in Ubuntu 20.04
In reply to Anuj MittalFrom: Martin Jansa <[email protected]>
* with Ubuntu 20.04 which is using python 3.8 I'm seeing a lot of errors like:
ERROR: libxml2-2.9.10-r0 do_package: Can NOT get PRAUTO, exception No module named '_sysconfigdata' not sure what caused this from python 3.8, but this seems to work
* PRserv is enabled with:
PRSERV_HOST = "localhost:0"
(From OE-Core rev: 4b26eaf7152fb712aba47a0c746333578f58ee8d)
--- meta/lib/oe/prservice.py | 4 ++++ 1 file changed, 4 insertions(+)
meta/lib/oe/prservice.py +4 -0
@@ -3,6 +3,10 @@ # def prserv_make_conn(d, check = False): + # Otherwise this fails when called from recipes which e.g. inherit python3native (which sets _PYTHON_SYSCONFIGDATA_NAME) with: + # No module named '_sysconfigdata' + if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: + del os.environ['_PYTHON_SYSCONFIGDATA_NAME'] import prserv.serv host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) try:
Signature · 1 line
2.25.4
PATCH 4/18 apt-native: don't let dpkg overwrite files by default
In reply to Anuj MittalFrom: Jan Luebbe <[email protected]>
With --force-overwrite (implied by --force-all), dpkg will not abort when a package overwrites files from different packages. As this can also lead to "The following package disappeared from your system as all files have been overwritten by other packages: <package>" and subsequently broken dependencies, this makes the simple case of conflicting files hard to debug.
Instead of finding all possibly required force options, only disable overwrite for now.
--- meta/recipes-devtools/apt/files/apt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/apt/files/apt.conf +1 -1
@@ -39,4 +39,4 @@ APT }; }; -DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; +DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-force-overwrite";"--no-debsig"};
Signature · 1 line
2.25.4
PATCH 5/18 glibc: CVE-2020-1751
In reply to Anuj MittalFrom: Zhixiong Chi <[email protected]>
Backport the CVE patch from upstream:git://sourceware.org/git/glibc.git
commit d93769405996dfc11d216ddbe415946617b5a494
--- .../glibc/glibc/CVE-2020-1751.patch | 70 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.30.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
meta/recipes-core/glibc/glibc/CVE-2020-1751.patch new file +70 -0
@@ -0,0 +1,70 @@ +From d93769405996dfc11d216ddbe415946617b5a494 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <[email protected]> +Date: Mon, 20 Jan 2020 17:01:50 +0100 +Subject: [PATCH] Fix array overflow in backtrace on PowerPC (bug 25423) + +When unwinding through a signal frame the backtrace function on PowerPC +didn't check array bounds when storing the frame address. Fixes commit +d400dcac5e ("PowerPC: fix backtrace to handle signal trampolines"). + +CVE: CVE-2020-1751 +Upstream-Status: Backport [git://sourceware.org/git/glibc.git] +Signed-off-by: Zhixiong Chi <[email protected]> +--- + debug/tst-backtrace5.c | 12 ++++++++++++ + sysdeps/powerpc/powerpc32/backtrace.c | 2 ++ + sysdeps/powerpc/powerpc64/backtrace.c | 2 ++ + 3 files changed, 16 insertions(+) + +diff --git a/debug/tst-backtrace5.c b/debug/tst-backtrace5.c +index e7ce410845..b2f46160e7 100644 +--- a/debug/tst-backtrace5.c ++++ b/debug/tst-backtrace5.c +@@ -89,6 +89,18 @@ handle_signal (int signum) + } + /* Symbol names are not available for static functions, so we do not + check do_test. */ ++ ++ /* Check that backtrace does not return more than what fits in the array ++ (bug 25423). */ ++ for (int j = 0; j < NUM_FUNCTIONS; j++) ++ { ++ n = backtrace (addresses, j); ++ if (n > j) ++ { ++ FAIL (); ++ return; ++ } ++ } + } + + NO_INLINE int +diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c +index 7c2d4726f8..d1456c8ae4 100644 +--- a/sysdeps/powerpc/powerpc32/backtrace.c ++++ b/sysdeps/powerpc/powerpc32/backtrace.c +@@ -114,6 +114,8 @@ __backtrace (void **array, int size) + } + if (gregset) + { ++ if (count + 1 == size) ++ break; + array[++count] = (void*)((*gregset)[PT_NIP]); + current = (void*)((*gregset)[PT_R1]); + } +diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c +index 65c260ab76..8a53a1088f 100644 +--- a/sysdeps/powerpc/powerpc64/backtrace.c ++++ b/sysdeps/powerpc/powerpc64/backtrace.c +@@ -87,6 +87,8 @@ __backtrace (void **array, int size) + if (is_sigtramp_address (current->return_address)) + { + struct signal_frame_64 *sigframe = (struct signal_frame_64*) current; ++ if (count + 1 == size) ++ break; + array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; + current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1]; + } +-- +2.23.0 +
meta/recipes-core/glibc/glibc_2.30.bb +1 -0
@@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ file://CVE-2019-19126.patch \ file://CVE-2020-10029.patch \ + file://CVE-2020-1751.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}"
Signature · 1 line
2.25.4
PATCH 6/18 git: Security Advisory - git - CVE-2020-5260
In reply to Anuj MittalFrom: Li Zhou <[email protected]>
Backport patch from <https://github.com/git/git/commit/9a6bbee8006c24b46a85d29e7b38cfa79e9ab21b> to solve CVE-2020-5260.
--- meta/recipes-devtools/git/git.inc | 4 +- .../git/git/CVE-2020-5260.patch | 65 +++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/git/git/CVE-2020-5260.patch
meta/recipes-devtools/git/git.inc +3 -1
@@ -7,7 +7,9 @@ DEPENDS = "openssl curl zlib expat" PROVIDES_append_class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ - ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" + ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ + file://CVE-2020-5260.patch \ + " S = "${WORKDIR}/git-${PV}"
meta/recipes-devtools/git/git/CVE-2020-5260.patch new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 7/18 git: Security Advisory - git - CVE-2020-11008
In reply to Anuj MittalFrom: Li Zhou <[email protected]>
Backport the 1st -- 9th patches listed by
<https://github.com/git/git/compare/v2.17.4...v2.17.5>
to solve CVE-2020-11008.
Also backport the 2nd -- 4th patches listed by
<https://github.com/git/git/compare/v2.17.3...v2.17.4>
for CVE-2020-5260 (not necessary, and only the 1st patch is necessary for this CVE), because some of the above 9 patches are based on them.
--- meta/recipes-devtools/git/git.inc | 12 + ...ial-use-test_i18ncmp-to-check-stderr.patch | 35 +++ ...t-unrepresentable-values-when-parsin.patch | 156 ++++++++++ ...tmodules-URLs-with-embedded-newlines.patch | 103 ++++++ .../git/git/CVE-2020-11008-1.patch | 70 +++++ .../git/git/CVE-2020-11008-2.patch | 292 ++++++++++++++++++ .../git/git/CVE-2020-11008-3.patch | 97 ++++++ .../git/git/CVE-2020-11008-4.patch | 173 +++++++++++ .../git/git/CVE-2020-11008-5.patch | 211 +++++++++++++ .../git/git/CVE-2020-11008-6.patch | 84 +++++ .../git/git/CVE-2020-11008-7.patch | 206 ++++++++++++ .../git/git/CVE-2020-11008-8.patch | 114 +++++++ .../git/git/CVE-2020-11008-9.patch | 114 +++++++ 13 files changed, 1667 insertions(+) create mode 100644 meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch create mode 100644 meta/recipes-devtools/git/git/0002-credential-detect-unrepresentable-values-when-parsin.patch create mode 100644 meta/recipes-devtools/git/git/0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-1.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-2.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-3.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-4.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-5.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-6.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-7.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-8.patch create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-9.patch
meta/recipes-devtools/git/git.inc +12 -0
@@ -9,6 +9,18 @@ PROVIDES_append_class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ file://CVE-2020-5260.patch \ + file://0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch \ + file://0002-credential-detect-unrepresentable-values-when-parsin.patch \ + file://0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch \ + file://CVE-2020-11008-1.patch \ + file://CVE-2020-11008-2.patch \ + file://CVE-2020-11008-3.patch \ + file://CVE-2020-11008-4.patch \ + file://CVE-2020-11008-5.patch \ + file://CVE-2020-11008-6.patch \ + file://CVE-2020-11008-7.patch \ + file://CVE-2020-11008-8.patch \ + file://CVE-2020-11008-9.patch \ " S = "${WORKDIR}/git-${PV}"
meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 70ef9c6ce884b2d466d3d36563f1d2aa31b56443 Mon Sep 17 00:00:00 2001 +From: Jeff King <[email protected]> +Date: Wed, 11 Mar 2020 18:11:37 -0400 +Subject: [PATCH 01/12] t/lib-credential: use test_i18ncmp to check stderr + +The credential tests have a "check" function which feeds some input to +git-credential and checks the stdout and stderr. We look for exact +matches in the output. For stdout, this makes sense; the output is +the credential protocol. But for stderr, we may be showing various +diagnostic messages, or the prompts fed to the askpass program, which +could be translated. Let's mark them as such. + +Upstream-Status: Backport + +Signed-off-by: Li Zhou <[email protected]> +--- + t/lib-credential.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/lib-credential.sh b/t/lib-credential.sh +index 937b831..bb88cc0 100755 +--- a/t/lib-credential.sh ++++ b/t/lib-credential.sh +@@ -19,7 +19,7 @@ check() { + false + fi && + test_cmp expect-stdout stdout && +- test_cmp expect-stderr stderr ++ test_i18ncmp expect-stderr stderr + } + + read_chunk() { +-- +1.9.1 +
meta/recipes-devtools/git/git/0002-credential-detect-unrepresentable-values-when-parsin.patch new file +156 -0
156 lines not on this page · raw message
meta/recipes-devtools/git/git/0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch new file +103 -0
103 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-1.patch new file +70 -0
70 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-2.patch new file +292 -0
292 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-3.patch new file +97 -0
97 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-4.patch new file +173 -0
173 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-5.patch new file +211 -0
211 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-6.patch new file +84 -0
84 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-7.patch new file +206 -0
206 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-8.patch new file +114 -0
114 lines not on this page · raw message
meta/recipes-devtools/git/git/CVE-2020-11008-9.patch new file +114 -0
114 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 8/18 cve-update-db-native: clean DB if temporary file exist
In reply to Anuj MittalFrom: Lee Chee Yang <[email protected]>
when do_populate_cve_db forced stop at certain point, the DB execution are stoped however the temporary database file (DB-JOURNAL) are not removed. This db-journal file indicates that DB is incomplete and set DB in readonly mode. So when db-journal exist, remove both DB and the db-journal and build the DB again from scratch.
[YOCTO #13682]
(From OE-Core rev: 70713df25b8ae27a21e53b0b9234567d7053800a)
--- meta/recipes-core/meta/cve-update-db-native.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta/recipes-core/meta/cve-update-db-native.bb +8 -1
@@ -13,8 +13,15 @@ deltask do_install deltask do_populate_sysroot python () { - if not d.getVar("CVE_CHECK_DB_FILE"): + cve_check_db_file = d.getVar("CVE_CHECK_DB_FILE") + if not cve_check_db_file: raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") + + if os.path.exists("%s-journal" % cve_check_db_file ): + os.remove("%s-journal" % cve_check_db_file) + + if os.path.exists(cve_check_db_file): + os.remove(cve_check_db_file) } python do_populate_cve_db() {
Signature · 1 line
2.25.4
PATCH 9/18 qemu: Add PACKAGECONFIG for glusterfs
In reply to Anuj MittalFrom: haiqing <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -167,6 +167,7 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice" # usbredir will be in meta-networking layer PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" +PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs" INSANE_SKIP_${PN} = "arch"
Signature · 1 line
2.25.4
PATCH 10/18 gnupg: upgrade 2.2.17 -> 2.2.19
In reply to Anuj MittalFrom: Wang Mingyu <[email protected]>
(From OE-Core rev: 287de363f80a2f9919b942a1349f58575e8b91d8)
---
.../gnupg/{gnupg_2.2.17.bb => gnupg_2.2.19.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.2.17.bb => gnupg_2.2.19.bb} (93%)meta/recipes-support/gnupg/gnupg_2.2.19.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.17.bb +2 -2
@@ -19,8 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" -SRC_URI[md5sum] = "1ba2d9b70c377f8e967742064c27a19c" -SRC_URI[sha256sum] = "afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514" +SRC_URI[md5sum] = "cb3b373d08ba078c325299945a7f2818" +SRC_URI[sha256sum] = "242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \
Signature · 1 line
2.25.4
PATCH 11/18 python: Upgrade 2.7.17 -> 2.17.18
In reply to Anuj MittalFrom: Adrian Bunk <[email protected]>
LICENSE checksum changed due to 2019 -> 2020 update.
---
.../{python-native_2.7.17.bb => python-native_2.7.18.bb} | 0
meta/recipes-devtools/python/python.inc | 6 +++---
.../python/{python_2.7.17.bb => python_2.7.18.bb} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python-native_2.7.17.bb => python-native_2.7.18.bb} (100%)
rename meta/recipes-devtools/python/{python_2.7.17.bb => python_2.7.18.bb} (100%)meta/recipes-devtools/python/python-native_2.7.18.bb renamed from meta/recipes-devtools/python/python-native_2.7.17.bb +0 -0
meta/recipes-devtools/python/python.inc +3 -3
@@ -5,13 +5,13 @@ SECTION = "devel/python" # bump this on every change in contrib/python/generate-manifest-2.7.py INC_PR = "r1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498" +LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ " -SRC_URI[md5sum] = "b3b6d2c92f42a60667814358ab9f0cfd" -SRC_URI[sha256sum] = "4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41" +SRC_URI[md5sum] = "fd6cc8ec0a78c44036f825e739f36e5a" +SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43" # python recipe is actually python 2.x # also, exclude pre-releases for both python 2.x and 3.x
meta/recipes-devtools/python/python_2.7.18.bb renamed from meta/recipes-devtools/python/python_2.7.17.bb +0 -0
Signature · 1 line
2.25.4
PATCH 12/18 qemu: fix CVE-2020-7039
In reply to Anuj MittalFrom: Changqing Li <[email protected]>
(From OE-Core rev: 5ea3d9d83ed695827634e3216664c13fcff6d48a)
--- meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2020-7039-1.patch | 44 +++++++++++++ .../qemu/qemu/CVE-2020-7039-2.patch | 59 +++++++++++++++++ .../qemu/qemu/CVE-2020-7039-3.patch | 64 +++++++++++++++++++ 4 files changed, 170 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch
meta/recipes-devtools/qemu/qemu.inc +3 -0
@@ -32,6 +32,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2019-12068.patch \ file://CVE-2020-1711.patch \ file://CVE-2019-20382.patch \ + file://CVE-2020-7039-1.patch \ + file://CVE-2020-7039-2.patch \ + file://CVE-2020-7039-3.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 13/18 qemu/slirp: fix CVE-2020-7211
In reply to Anuj MittalFrom: Chee Yang Lee <[email protected]>
fix CVE-2020-7211 for qemu slirp submodule
see :
https://www.openwall.com/lists/oss-security/2020/01/17/2
https://gitlab.freedesktop.org/slirp/libslirp/commit/14ec36e107a8c9af7d0a80c3571fe39b291ff1d4
(From OE-Core rev: 31362d739834377ac4ab880029c3e3dda0cd7698)
--- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2020-7211.patch | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7211.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -35,6 +35,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-7039-1.patch \ file://CVE-2020-7039-2.patch \ file://CVE-2020-7039-3.patch \ + file://CVE-2020-7211.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2020-7211.patch new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 14/18 gnutls: upgrade 3.6.8 -> 3.6.11.1
In reply to Anuj MittalFrom: Alex Kiernan <[email protected]>
Drop patch from 81485be19b18 ("gnutls: don't use HOSTTOOLS_DIR/bash as a shell on target") as upstream now honours POSIX_SHELL when set as the primary target shell.
(From OE-Core rev: bc487ced3be40569157fb40c99bfa68871f74744)
---
.../gnutls/gnutls/posix-shell.patch | 39 -------------------
.../{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} | 5 +--
2 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls/posix-shell.patch
rename meta/recipes-support/gnutls/{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} (92%)meta/recipes-support/gnutls/gnutls/posix-shell.patch deleted +0 -39
@@ -1,39 +0,0 @@ -Don't embed the path to the build-time POSIX shell as this will be -$TMPDIR/hosttools/bash, which is no good on the target. - -Instead default to /bin/sh but allow it to be set in the environment. - -This isn't really upstreamable but I filed a bug at -https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be -integrated. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 -index c6ad738..a62faca 100644 ---- a/src/libopts/m4/libopts.m4 -+++ b/src/libopts/m4/libopts.m4 -@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ - AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ - strrchr strsignal fchmod fstat chmod]) - AC_PROG_SED -- [while : -- do -- POSIX_SHELL=`which bash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`which dash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=/usr/xpg4/bin/sh -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`/bin/sh -c ' -- exec 2>/dev/null -- if ! true ; then exit 1 ; fi -- echo /bin/sh'` -- test -x "$POSIX_SHELL" && break -- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ -- done] -+ POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" - AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], - [define to a working POSIX compliant shell]) - AC_SUBST([POSIX_SHELL])
meta/recipes-support/gnutls/gnutls_3.6.11.1.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.8.bb +2 -3
@@ -19,11 +19,10 @@ 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://posix-shell.patch \ " -SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8" -SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83" +SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" +SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
Signature · 1 line
2.25.4
PATCH 15/18 gnutls: upgrade 3.6.11.1 -> 3.6.12
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
(From OE-Core rev: 8652c95ceb505dd7386166842486c833ea5a7ee7)
---
.../gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} (93%)meta/recipes-support/gnutls/gnutls_3.6.12.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +2 -2
@@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
Signature · 1 line
2.25.4
PATCH 16/18 gnutls: upgrade 3.6.12 -> 3.6.13
In reply to Anuj MittalFrom: Wang Mingyu <[email protected]>
(From OE-Core rev: 5cc0f0dcf1f41bc148b034b3f7abef756a328cd3)
---
.../gnutls/{gnutls_3.6.12.bb => gnutls_3.6.13.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.6.12.bb => gnutls_3.6.13.bb} (93%)meta/recipes-support/gnutls/gnutls_3.6.13.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.12.bb +2 -2
@@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" -SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" +SRC_URI[md5sum] = "bb1fe696a11543433785b4fc70ca225f" +SRC_URI[sha256sum] = "32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
Signature · 1 line
2.25.4
PATCH 17/18 systemd: Fix CVE-2020-1712
In reply to Anuj MittalFrom: "[email protected]" <[email protected]>
Fix CVE-2020-1712
--- .../0001-Merge-branch-polkit-ref-count.patch | 520 ++++++++++++++++++ meta/recipes-core/systemd/systemd_243.2.bb | 1 + 2 files changed, 521 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-Merge-branch-polkit-ref-count.patch
meta/recipes-core/systemd/systemd/0001-Merge-branch-polkit-ref-count.patch new file +520 -0
@@ -0,0 +1,520 @@ +From 0062d795bf29301ae054e1826a7189198a2565c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Tue, 14 Apr 2020 09:06:53 +0000 +Subject: [PATCH] Merge branch 'polkit-ref-count' + +Upsteam-Status: Backport [https://github.com/systemd/systemd/commit/ea0d0ede03c6f18dbc5036c5e9cccf97e415ccc2] +CVE: CVE-2020-1712 + +Signed-off-by: Wenlin Kang <[email protected]> +--- + TODO | 2 +- + man/rules/meson.build | 1 + + man/sd_bus_enqueue_for_read.xml | 88 ++++++++++++++++ + src/libsystemd/libsystemd.sym | 1 + + src/libsystemd/sd-bus/sd-bus.c | 24 +++++ + src/shared/bus-util.c | 179 +++++++++++++++++++++----------- + src/systemd/sd-bus.h | 1 + + 7 files changed, 235 insertions(+), 61 deletions(-) + create mode 100644 man/sd_bus_enqueue_for_read.xml + +diff --git a/TODO b/TODO +index c5b5b86057..5c5ea1f568 100644 +--- a/TODO ++++ b/TODO +@@ -184,7 +184,7 @@ Features: + + * the a-posteriori stopping of units bound to units that disappeared logic + should be reworked: there should be a queue of units, and we should only +- enqeue stop jobs from a defer event that processes queue instead of ++ enqueue stop jobs from a defer event that processes queue instead of + right-away when we find a unit that is bound to one that doesn't exist + anymore. (similar to how the stop-unneeded queue has been reworked the same + way) +diff --git a/man/rules/meson.build b/man/rules/meson.build +index 3b63311d7b..e80ed98c34 100644 +--- a/man/rules/meson.build ++++ b/man/rules/meson.build +@@ -192,6 +192,7 @@ manpages = [ + 'sd_bus_open_user_with_description', + 'sd_bus_open_with_description'], + ''], ++ ['sd_bus_enqueue_for_read', '3', [], ''], + ['sd_bus_error', + '3', + ['SD_BUS_ERROR_MAKE_CONST', +diff --git a/man/sd_bus_enqueue_for_read.xml b/man/sd_bus_enqueue_for_read.xml +new file mode 100644 +index 0000000000..3318a3031b +--- /dev/null ++++ b/man/sd_bus_enqueue_for_read.xml +@@ -0,0 +1,88 @@ ++<?xml version='1.0'?> ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" ++ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> ++<!-- SPDX-License-Identifier: LGPL-2.1+ --> ++ ++<refentry id="sd_bus_enqueue_for_read" ++ xmlns:xi="http://www.w3.org/2001/XInclude"> ++ ++ <refentryinfo> ++ <title>sd_bus_enqueue_for_read</title> ++ <productname>systemd</productname> ++ </refentryinfo> ++ ++ <refmeta> ++ <refentrytitle>sd_bus_enqueue_for_read</refentrytitle> ++ <manvolnum>3</manvolnum> ++ </refmeta> ++ ++ <refnamediv> ++ <refname>sd_bus_enqueue_for_read</refname> ++ ++ <refpurpose>Re-enqueue a bus message on a bus connection, for reading.</refpurpose> ++ </refnamediv> ++ ++ <refsynopsisdiv> ++ <funcsynopsis> ++ <funcsynopsisinfo>#include <systemd/sd-bus.h></funcsynopsisinfo> ++ ++ <funcprototype> ++ <funcdef>int <function>sd_bus_enqueue_for_read</function></funcdef> ++ <paramdef>sd_bus *<parameter>bus</parameter></paramdef> ++ <paramdef>sd_bus_message *<parameter>message</parameter></paramdef> ++ </funcprototype> ++ ++ </funcsynopsis> ++ </refsynopsisdiv> ++ ++ <refsect1> ++ <title>Description</title> ++ ++ <para><function>sd_bus_enqueue_for_read()</function> may be used to re-enqueue an incoming bus message on ++ the local read queue, so that it is processed and dispatched locally again, similar to how an incoming ++ message from the peer is processed. Takes a bus connection object and the message to enqueue. A reference ++ is taken of the message and the caller's reference thus remains in possession of the caller. The message ++ is enqueued at the end of the queue, thus will be dispatched after all other already queued messages are ++ dispatched.</para> ++ ++ <para>This call is primarily useful for dealing with incoming method calls that may be processed only ++ after an additional asynchronous operation completes. One example are PolicyKit authorization requests ++ that are determined to be necessary to authorize a newly incoming method call: when the PolicyKit response ++ is received the original method call may be re-enqueued to process it again, this time with the ++ authorization result known.</para> ++ </refsect1> ++ ++ <refsect1> ++ <title>Return Value</title> ++ ++ <para>On success, this function return 0 or a positive integer. On failure, it returns a negative errno-style ++ error code.</para> ++ ++ <refsect2> ++ <title>Errors</title> ++ ++ <para>Returned errors may indicate the following problems:</para> ++ ++ <variablelist> ++ <varlistentry> ++ <term><constant>-ECHILD</constant></term> ++ ++ <listitem><para>The bus connection has been created in a different process.</para></listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect2> ++ </refsect1> ++ ++ <xi:include href="libsystemd-pkgconfig.xml" /> ++ ++ <refsect1> ++ <title>See Also</title> ++ ++ <para> ++ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, ++ <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, ++ <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>, ++ </para> ++ </refsect1> ++ ++</refentry> +diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym +index 5ec42e0f1f..c40f1b7d1a 100644 +--- a/src/libsystemd/libsystemd.sym ++++ b/src/libsystemd/libsystemd.sym +@@ -679,6 +679,7 @@ global: + + LIBSYSTEMD_243 { + global: ++ sd_bus_enqueue_for_read; + sd_bus_object_vtable_format; + sd_event_source_disable_unref; + } LIBSYSTEMD_241; +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index 026ac8cb94..07bc145f37 100644 +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -4194,3 +4194,27 @@ _public_ int sd_bus_get_close_on_exit(sd_bus *bus) { + + return bus->close_on_exit; + } ++ ++_public_ int sd_bus_enqueue_for_read(sd_bus *bus, sd_bus_message *m) { ++ int r; ++ ++ assert_return(bus, -EINVAL); ++ assert_return(bus = bus_resolve(bus), -ENOPKG); ++ assert_return(m, -EINVAL); ++ assert_return(m->sealed, -EINVAL); ++ assert_return(!bus_pid_changed(bus), -ECHILD); ++ ++ if (!BUS_IS_OPEN(bus->state)) ++ return -ENOTCONN; ++ ++ /* Re-enqueue a message for reading. This is primarily useful for PolicyKit-style authentication, ++ * where we accept a message, then determine we need to interactively authenticate the user, and then ++ * we want to process the message again. */ ++ ++ r = bus_rqueue_make_room(bus); ++ if (r < 0) ++ return r; ++ ++ bus->rqueue[bus->rqueue_size++] = bus_message_ref_queued(m, bus); ++ return 0; ++} +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index e9b0b8a99d..88cad9cd0a 100644 +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -212,6 +212,34 @@ static int check_good_user(sd_bus_message *m, uid_t good_user) { + return sender_uid == good_user; + } + ++#if ENABLE_POLKIT ++static int bus_message_append_strv_key_value( ++ sd_bus_message *m, ++ const char **l) { ++ ++ const char **k, **v; ++ int r; ++ ++ assert(m); ++ ++ r = sd_bus_message_open_container(m, 'a', "{ss}"); ++ if (r < 0) ++ return r; ++ ++ STRV_FOREACH_PAIR(k, v, l) { ++ r = sd_bus_message_append(m, "{ss}", *k, *v); ++ if (r < 0) ++ return r; ++ } ++ ++ r = sd_bus_message_close_container(m); ++ if (r < 0) ++ return r; ++ ++ return r; ++} ++#endif ++ + int bus_test_polkit( + sd_bus_message *call, + int capability, +@@ -219,7 +247,7 @@ int bus_test_polkit( + const char **details, + uid_t good_user, + bool *_challenge, +- sd_bus_error *e) { ++ sd_bus_error *ret_error) { + + int r; + +@@ -242,7 +270,7 @@ int bus_test_polkit( + _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; + int authorized = false, challenge = false; +- const char *sender, **k, **v; ++ const char *sender; + + sender = sd_bus_message_get_sender(call); + if (!sender) +@@ -266,17 +294,7 @@ int bus_test_polkit( + if (r < 0) + return r; + +- r = sd_bus_message_open_container(request, 'a', "{ss}"); +- if (r < 0) +- return r; +- +- STRV_FOREACH_PAIR(k, v, details) { +- r = sd_bus_message_append(request, "{ss}", *k, *v); +- if (r < 0) +- return r; +- } +- +- r = sd_bus_message_close_container(request); ++ r = bus_message_append_strv_key_value(request, details); + if (r < 0) + return r; + +@@ -284,11 +302,11 @@ int bus_test_polkit( + if (r < 0) + return r; + +- r = sd_bus_call(call->bus, request, 0, e, &reply); ++ r = sd_bus_call(call->bus, request, 0, ret_error, &reply); + if (r < 0) { + /* Treat no PK available as access denied */ +- if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) { +- sd_bus_error_free(e); ++ if (sd_bus_error_has_name(ret_error, SD_BUS_ERROR_SERVICE_UNKNOWN)) { ++ sd_bus_error_free(ret_error); + return -EACCES; + } + +@@ -319,15 +337,17 @@ int bus_test_polkit( + #if ENABLE_POLKIT + + typedef struct AsyncPolkitQuery { ++ char *action; ++ char **details; ++ + sd_bus_message *request, *reply; +- sd_bus_message_handler_t callback; +- void *userdata; + sd_bus_slot *slot; ++ + Hashmap *registry; ++ sd_event_source *defer_event_source; + } AsyncPolkitQuery; + + static void async_polkit_query_free(AsyncPolkitQuery *q) { +- + if (!q) + return; + +@@ -339,9 +359,25 @@ static void async_polkit_query_free(AsyncPolkitQuery *q) { + sd_bus_message_unref(q->request); + sd_bus_message_unref(q->reply); + ++ free(q->action); ++ strv_free(q->details); ++ ++ sd_event_source_disable_unref(q->defer_event_source); + free(q); + } + ++static int async_polkit_defer(sd_event_source *s, void *userdata) { ++ AsyncPolkitQuery *q = userdata; ++ ++ assert(s); ++ ++ /* This is called as idle event source after we processed the async polkit reply, hopefully after the ++ * method call we re-enqueued has been properly processed. */ ++ ++ async_polkit_query_free(q); ++ return 0; ++} ++ + static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) { + _cleanup_(sd_bus_error_free) sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + AsyncPolkitQuery *q = userdata; +@@ -350,21 +386,46 @@ static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_e + assert(reply); + assert(q); + ++ assert(q->slot); + q->slot = sd_bus_slot_unref(q->slot); ++ ++ assert(!q->reply); + q->reply = sd_bus_message_ref(reply); + ++ /* Now, let's dispatch the original message a second time be re-enqueing. This will then traverse the ++ * whole message processing again, and thus re-validating and re-retrieving the "userdata" field ++ * again. ++ * ++ * We install an idle event loop event to clean-up the PolicyKit request data when we are idle again, ++ * i.e. after the second time the message is processed is complete. */ ++ ++ assert(!q->defer_event_source); ++ r = sd_event_add_defer(sd_bus_get_event(sd_bus_message_get_bus(reply)), &q->defer_event_source, async_polkit_defer, q); ++ if (r < 0) ++ goto fail; ++ ++ r = sd_event_source_set_priority(q->defer_event_source, SD_EVENT_PRIORITY_IDLE); ++ if (r < 0) ++ goto fail; ++ ++ r = sd_event_source_set_enabled(q->defer_event_source, SD_EVENT_ONESHOT); ++ if (r < 0) ++ goto fail; ++ + r = sd_bus_message_rewind(q->request, true); +- if (r < 0) { +- r = sd_bus_reply_method_errno(q->request, r, NULL); +- goto finish; +- } ++ if (r < 0) ++ goto fail; + +- r = q->callback(q->request, q->userdata, &error_buffer); +- r = bus_maybe_reply_error(q->request, r, &error_buffer); ++ r = sd_bus_enqueue_for_read(sd_bus_message_get_bus(q->request), q->request); ++ if (r < 0) ++ goto fail; + +-finish: +- async_polkit_query_free(q); ++ return 1; + ++fail: ++ log_debug_errno(r, "Processing asynchronous PolicyKit reply failed, ignoring: %m"); ++ (void) sd_bus_reply_method_errno(q->request, r, NULL); ++ async_polkit_query_free(q); + return r; + } + +@@ -378,16 +439,14 @@ int bus_verify_polkit_async( + bool interactive, + uid_t good_user, + Hashmap **registry, +- sd_bus_error *error) { ++ sd_bus_error *ret_error) { + + #if ENABLE_POLKIT + _cleanup_(sd_bus_message_unrefp) sd_bus_message *pk = NULL; + AsyncPolkitQuery *q; +- const char *sender, **k, **v; +- sd_bus_message_handler_t callback; +- void *userdata; + int c; + #endif ++ const char *sender; + int r; + + assert(call); +@@ -403,11 +462,17 @@ int bus_verify_polkit_async( + if (q) { + int authorized, challenge; + +- /* This is the second invocation of this function, and +- * there's already a response from polkit, let's +- * process it */ ++ /* This is the second invocation of this function, and there's already a response from ++ * polkit, let's process it */ + assert(q->reply); + ++ /* If the operation we want to authenticate changed between the first and the second time, ++ * let's not use this authentication, it might be out of date as the object and context we ++ * operate on might have changed. */ ++ if (!streq(q->action, action) || ++ !strv_equal(q->details, (char**) details)) ++ return -ESTALE; ++ + if (sd_bus_message_is_method_error(q->reply, NULL)) { + const sd_bus_error *e; + +@@ -418,7 +483,7 @@ int bus_verify_polkit_async( + return -EACCES; + + /* Copy error from polkit reply */ +- sd_bus_error_copy(error, e); ++ sd_bus_error_copy(ret_error, e); + return -sd_bus_error_get_errno(e); + } + +@@ -433,7 +498,7 @@ int bus_verify_polkit_async( + return 1; + + if (challenge) +- return sd_bus_error_set(error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required."); ++ return sd_bus_error_set(ret_error, SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED, "Interactive authentication required."); + + return -EACCES; + } +@@ -445,20 +510,12 @@ int bus_verify_polkit_async( + else if (r > 0) + return 1; + +-#if ENABLE_POLKIT +- if (sd_bus_get_current_message(call->bus) != call) +- return -EINVAL; +- +- callback = sd_bus_get_current_handler(call->bus); +- if (!callback) +- return -EINVAL; +- +- userdata = sd_bus_get_current_userdata(call->bus); + + sender = sd_bus_message_get_sender(call); + if (!sender) + return -EBADMSG; + ++#if ENABLE_POLKIT + c = sd_bus_message_get_allow_interactive_authorization(call); + if (c < 0) + return c; +@@ -487,17 +544,7 @@ int bus_verify_polkit_async( + if (r < 0) + return r; + +- r = sd_bus_message_open_container(pk, 'a', "{ss}"); +- if (r < 0) +- return r; +- +- STRV_FOREACH_PAIR(k, v, details) { +- r = sd_bus_message_append(pk, "{ss}", *k, *v); +- if (r < 0) +- return r; +- } +- +- r = sd_bus_message_close_container(pk); ++ r = bus_message_append_strv_key_value(pk, details); + if (r < 0) + return r; + +@@ -505,13 +552,25 @@ int bus_verify_polkit_async( + if (r < 0) + return r; + +- q = new0(AsyncPolkitQuery, 1); ++ q = new(AsyncPolkitQuery, 1); + if (!q) + return -ENOMEM; + +- q->request = sd_bus_message_ref(call); +- q->callback = callback; +- q->userdata = userdata; ++ *q = (AsyncPolkitQuery) { ++ .request = sd_bus_message_ref(call), ++ }; ++ ++ q->action = strdup(action); ++ if (!q->action) { ++ async_polkit_query_free(q); ++ return -ENOMEM; ++ } ++ ++ q->details = strv_copy((char**) details); ++ if (!q->details) { ++ async_polkit_query_free(q); ++ return -ENOMEM; ++ } + + r = hashmap_put(*registry, call, q); + if (r < 0) { +diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h +index 84ceb62dc7..0e5c761f83 100644 +--- a/src/systemd/sd-bus.h ++++ b/src/systemd/sd-bus.h +@@ -201,6 +201,7 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **r); + int sd_bus_process_priority(sd_bus *bus, int64_t max_priority, sd_bus_message **r); + int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec); + int sd_bus_flush(sd_bus *bus); ++int sd_bus_enqueue_for_read(sd_bus *bus, sd_bus_message *m); + + sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus); + sd_bus_message* sd_bus_get_current_message(sd_bus *bus); +-- +2.23.0 +
meta/recipes-core/systemd/systemd_243.2.bb +1 -0
@@ -24,6 +24,7 @@ SRC_URI += "file://touchscreen.rules \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ file://99-default.preset \ + file://0001-Merge-branch-polkit-ref-count.patch \ " # patches needed by musl
Signature · 1 line
2.25.4
PATCH 18/18 openssl: upgrade 1.1.1f -> 1.1.1g
In reply to Anuj MittalFrom: Jan Luebbe <[email protected]>
This also fixes CVE-2020-1967.
---
.../openssl/{openssl_1.1.1f.bb => openssl_1.1.1g.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/openssl/{openssl_1.1.1f.bb => openssl_1.1.1g.bb} (98%)meta/recipes-connectivity/openssl/openssl_1.1.1g.bb renamed from meta/recipes-connectivity/openssl/openssl_1.1.1f.bb +1 -1
@@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" +SRC_URI[sha256sum] = "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46" inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Signature · 1 line
2.25.4
✗ patchtest: failure for zeus patch review
In reply to Anuj Mittal== Series Details ==
Series: zeus patch review
Revision: 1
URL : https://patchwork.openembedded.org/series/23949/
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,18/18] openssl: upgrade 1.1.1f -> 1.1.1g 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-core/systemd/systemd/0001-Merge-branch-polkit-ref-count.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