Patch review
cover Patch review
Please review this next set of patches for dunfell and have comments back by end of day Friday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2144
The following changes since commit 5b2ad70cd82c3b812652886ee4bf29f88dcac42c:
reproducible.py: add quilt-ptest and valgrind-ptest (2021-05-07 05:21:23 -1000)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut
Alexander Kanavin (1):
linux-firmware: upgrade 20210208 -> 20210315
Anuj Mittal (1):
lsb-release: fix reproducibility failure
Bruce Ashfield (1):
linux-yocto/5.4: qemuppc32: reduce serial shutdown issues
Chen Qi (1):
db: update CVE_PRODUCT
Lee Chee Yang (4):
subversion: fix CVE-2020-17525
qemu: fix CVE-2021-3392
tiff: fix CVE-2020-35523 CVE-2020-35524
python3-jinja2: 2.11.2 -> 2.11.3
Richard Purdie (9):
glibc: Document and whitelist CVE-2019-1010022-25
qemu: Exclude CVE-2017-5957 from cve-check
qemu: Exclude CVE-2007-0998 from cve-check
qemu: Exclude CVE-2018-18438 from cve-check
jquery: Exclude CVE-2007-2379 from cve-check
logrotate: Exclude CVE-2011-1548,1549,1550 from cve-check
openssh: Exclude CVE-2007-2768 from cve-check oeqa/qemurunner: Fix binary vs str issue
oeqa/qemurunner: Improve handling of run_serial for shutdown commands
Romain Naour (1):
dejagnu: needs expect at runtime
Ross Burton (3):
cairo: backport patch for CVE-2020-35492
libnotify: whitelist CVE-2013-7381 (specific to the NodeJS bindings)
builder: whitelist CVE-2008-4178 (a different builder)
Yann Dirson (1):
linux-firmware: include all relevant files in -bcm4356
meta/lib/oeqa/utils/qemurunner.py | 11 +-
.../openssh/openssh_8.2p1.bb | 3 +
meta/recipes-core/glibc/glibc_2.31.bb | 13 ++
.../recipes-devtools/dejagnu/dejagnu_1.6.2.bb | 1 +
meta/recipes-devtools/jquery/jquery_3.5.0.bb | 5 +
...ja2_2.11.2.bb => python3-jinja2_2.11.3.bb} | 2 +-
meta/recipes-devtools/qemu/qemu.inc | 12 ++
.../qemu/qemu/CVE-2021-3392.patch | 92 ++++++++++++++
.../subversion/CVE-2020-17525.patch | 117 ++++++++++++++++++
.../subversion/subversion_1.13.0.bb | 1 +
.../logrotate/logrotate_3.15.1.bb | 3 +
.../help2man-reproducibility.patch | 27 ++++
meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 +
.../libnotify/libnotify_0.7.8.bb | 3 +
meta/recipes-graphics/builder/builder_0.1.bb | 2 +
.../cairo/cairo/CVE-2020-35492.patch | 60 +++++++++
meta/recipes-graphics/cairo/cairo_1.16.0.bb | 1 +
...20210208.bb => linux-firmware_20210315.bb} | 8 +-
.../linux/linux-yocto-rt_5.4.bb | 2 +-
.../linux/linux-yocto-tiny_5.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +-
.../libtiff/files/CVE-2020-35523.patch | 55 ++++++++
.../libtiff/files/CVE-2020-35524-1.patch | 42 +++++++
.../libtiff/files/CVE-2020-35524-2.patch | 36 ++++++
meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | 3 +
meta/recipes-support/db/db_5.3.28.bb | 2 +-
26 files changed, 494 insertions(+), 12 deletions(-)
rename meta/recipes-devtools/python/{python3-jinja2_2.11.2.bb => python3-jinja2_2.11.3.bb} (92%)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch
create mode 100644 meta/recipes-devtools/subversion/subversion/CVE-2020-17525.patch
create mode 100644 meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch
create mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210208.bb => linux-firmware_20210315.bb} (99%)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35523.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35524-1.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35524-2.patchSignature · 1 line
2.25.1
PATCH 1/22 subversion: fix CVE-2020-17525
From: Lee Chee Yang <[email protected]>
--- .../subversion/CVE-2020-17525.patch | 117 ++++++++++++++++++ .../subversion/subversion_1.13.0.bb | 1 + 2 files changed, 118 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion/CVE-2020-17525.patch
meta/recipes-devtools/subversion/subversion/CVE-2020-17525.patch new file +117 -0
@@ -0,0 +1,117 @@ +Upstream-Status: Backport [ https://subversion.apache.org/security/CVE-2020-17525-advisory.txt ] +CVE: CVE-2020-17525 +Signed-off-by: Chee Yang Lee <[email protected]> + + Remote unauthenticated denial-of-service in Subversion mod_authz_svn. + +Summary: +======== + + Subversion's mod_authz_svn module will crash if the server is using + in-repository authz rules with the AuthzSVNReposRelativeAccessFile + option and a client sends a request for a non-existing repository URL. + + This can lead to disruption for users of the service. + +Known vulnerable: +================= + + mod_dav_svn+mod_authz_svn servers 1.9.0 through 1.10.6 (inclusive). + mod_dav_svn+mod_authz_svn servers 1.11.0 through 1.14.0 (inclusive). + +Known fixed: +============ + + mod_dav_svn+mod_authz_svn servers 1.14.1 + mod_dav_svn+mod_authz_svn servers 1.10.7 + +Details: +======== + + A null-pointer-dereference has been found in mod_authz_svn that results in + a remote unauthenticated Denial-of-Service in some server configurations. + + The vulnerability can be triggered by an unauthenticated user if the + Apache HTTPD server is configured to use an in-repository authz file, + with configuration directives such as: + + AuthzSVNAccessFile "^/authz" + AuthzSVNReposRelativeAccessFile "^/authz" + + The problem originates when sending a GET request to a non-existent + repository. The mod_authz_svn module will attempt to find authz rules + at a path within the requested SVN repository. Upon constructing this + path, the function svn_repos_find_root_path will return a NULL pointer + since the requested repository does not exist on-disk. + A check for this legitimate NULL pointer condition is missing, which + results in a segmentation fault when the NULL pointer is used. + + The in-repository authz feature was first introduced in Subversion 1.8: + https://subversion.apache.org/docs/release-notes/1.8.html#in-repo-authz + + The missing NULL check was first introduced during refactoring of the + authz code during development work leading up to Subversion 1.9. + Subversion 1.8 servers are unaffected. + +Severity: +========= + + CVSSv3 Base Score: 7.5 (High) + + CVSSv3 Base Vector: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H + + Exploitation results in denial of service by crashing the HTTPD worker + handling the request. The impact of this differs depending on how the + Apache HTTPD server is configured, including the choice of MPM (Multi- + Processing-Module). If the worker shares its memory address space with + the main thread, as is the case with e.g. the Event MPM, the entire + HTTPD server process will terminate. If the pre-fork MPM is used, the + worker will terminate but the HTTPD server will stay up, and service + availability will depend on how frequently the attacker is able to + send malicious requests which target the vulnerability. + +Recommendations: +================ + + We recommend all users to upgrade to a known fixed release of the + Subversion mod_dav_svn server. + + Users who are unable to upgrade may apply the included patches. + + As a workaround, the use of in-repository authz rules files with + the AuthzSVNReposRelativeAccessFile can be avoided by switching + to an alternative configuration which fetches an authz rules file + from the server's filesystem, rather than from an SVN repository. + +References: +=========== + + CVE-2020-17525 (Subversion) + +Reported by: +============ + + Thomas Åkesson, simonsoft.se + +Patches: +======== + + Patch for Subversion 1.10, 1.14: + +[[[ +Index: subversion/libsvn_repos/config_file.c +=================================================================== +--- a/subversion/libsvn_repos/config_file.c (revision 1883994) ++++ b/subversion/libsvn_repos/config_file.c (working copy) +@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream, + { + /* Search for a repository in the full path. */ + repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool); ++ if (repos_root_dirent == NULL) ++ return svn_error_trace(handle_missing_file(stream, checksum, access, ++ url, must_exist, ++ svn_node_none)); + + /* Attempt to open a repository at repos_root_dirent. */ + SVN_ERR(svn_repos_open3(&access->repos, repos_root_dirent, NULL, +]]]
meta/recipes-devtools/subversion/subversion_1.13.0.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ file://0001-Fix-libtool-name-in-configure.ac.patch \ file://serfmacro.patch \ + file://CVE-2020-17525.patch \ " SRC_URI[md5sum] = "3004b4dae18bf45a0b6ea4ef8820064d"
Signature · 1 line
2.25.1
PATCH 2/22 qemu: fix CVE-2021-3392
In reply to Steve SakomanFrom: Lee Chee Yang <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3392.patch | 92 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -54,6 +54,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-24352.patch \ file://CVE-2020-25723.patch \ file://CVE-2021-20203.patch \ + file://CVE-2021-3392.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2021-3392.patch new file +92 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 3/22 tiff: fix CVE-2020-35523 CVE-2020-35524
In reply to Steve SakomanFrom: Lee Chee Yang <[email protected]>
--- .../libtiff/files/CVE-2020-35523.patch | 55 +++++++++++++++++++ .../libtiff/files/CVE-2020-35524-1.patch | 42 ++++++++++++++ .../libtiff/files/CVE-2020-35524-2.patch | 36 ++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | 3 + 4 files changed, 136 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35523.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35524-1.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2020-35524-2.patch
meta/recipes-multimedia/libtiff/files/CVE-2020-35523.patch new file +55 -0
@@ -0,0 +1,55 @@ +From c8d613ef497058fe653c467fc84c70a62a4a71b2 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard <[email protected]> +Date: Tue, 10 Nov 2020 01:54:30 +0100 +Subject: [PATCH] gtTileContig(): check Tile width for overflow + +fixes #211 + +Upstream-Status: Backport [ https://gitlab.com/libtiff/libtiff/-/commit/c8d613ef497058fe653c467fc84c70a62a4a71b2 ] +CVE: CVE-2020-35523 +Signed-off-by: Chee Yang Lee <[email protected]> +--- + libtiff/tif_getimage.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c +index 4da785d3..96ab1460 100644 +--- a/libtiff/tif_getimage.c ++++ b/libtiff/tif_getimage.c +@@ -29,6 +29,7 @@ + */ + #include "tiffiop.h" + #include <stdio.h> ++#include <limits.h> + + static int gtTileContig(TIFFRGBAImage*, uint32*, uint32, uint32); + static int gtTileSeparate(TIFFRGBAImage*, uint32*, uint32, uint32); +@@ -645,12 +646,20 @@ gtTileContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h) + + flip = setorientation(img); + if (flip & FLIP_VERTICALLY) { +- y = h - 1; +- toskew = -(int32)(tw + w); ++ if ((tw + w) > INT_MAX) { ++ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", "unsupported tile size (too wide)"); ++ return (0); ++ } ++ y = h - 1; ++ toskew = -(int32)(tw + w); + } + else { +- y = 0; +- toskew = -(int32)(tw - w); ++ if (tw > (INT_MAX + w)) { ++ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", "unsupported tile size (too wide)"); ++ return (0); ++ } ++ y = 0; ++ toskew = -(int32)(tw - w); + } + + /* +-- +GitLab + +
meta/recipes-multimedia/libtiff/files/CVE-2020-35524-1.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-multimedia/libtiff/files/CVE-2020-35524-2.patch new file +36 -0
@@ -0,0 +1,36 @@ +From d74f56e3b7ea55c8a18a03bc247cd5fd0ca288b2 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard <[email protected]> +Date: Tue, 10 Nov 2020 02:05:05 +0100 +Subject: [PATCH] Fix for building without JPEG support + +Upstream-Status: Backport +https://gitlab.com/libtiff/libtiff/-/commit/d74f56e3b7ea55c8a18a03bc247cd5fd0ca288b2 +https://gitlab.com/libtiff/libtiff/-/merge_requests/159/commits +CVE: CVE-2021-35524 +Signed-off-by: Chee Yang Lee <[email protected]> +--- + tools/tiff2pdf.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c +index dc69d2f9..d0b0ede7 100644 +--- a/tools/tiff2pdf.c ++++ b/tools/tiff2pdf.c +@@ -2087,10 +2087,13 @@ void t2p_read_tiff_size(T2P* t2p, TIFF* input){ + #endif + (void) 0; + } ++#ifdef JPEG_SUPPORT + if(t2p->pdf_compression == T2P_COMPRESS_JPEG + && t2p->tiff_photometric == PHOTOMETRIC_YCBCR) { + k = checkMultiply64(TIFFNumberOfStrips(input), TIFFStripSize(input), t2p); +- } else { ++ } else ++#endif ++ { + k = checkMultiply64(TIFFScanlineSize(input), t2p->tiff_length, t2p); + if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){ + k = checkMultiply64(k, t2p->tiff_samplesperpixel, t2p); +-- +GitLab +
meta/recipes-multimedia/libtiff/tiff_4.1.0.bb +3 -0
@@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ + file://CVE-2020-35523.patch \ + file://CVE-2020-35524-1.patch \ + file://CVE-2020-35524-2.patch \ " SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424" SRC_URI[sha256sum] = "5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634"
Signature · 1 line
2.25.1
PATCH 4/22 python3-jinja2: 2.11.2 -> 2.11.3
In reply to Steve SakomanFrom: Lee Chee Yang <[email protected]>
updates include fix for CVE-2020-28493
changelog:
https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-3
---
.../{python3-jinja2_2.11.2.bb => python3-jinja2_2.11.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-jinja2_2.11.2.bb => python3-jinja2_2.11.3.bb} (92%)meta/recipes-devtools/python/python3-jinja2_2.11.3.bb renamed from meta/recipes-devtools/python/python3-jinja2_2.11.2.bb +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0" +SRC_URI[sha256sum] = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" PYPI_PACKAGE = "Jinja2"
Signature · 1 line
2.25.1
PATCH 5/22 glibc: Document and whitelist CVE-2019-1010022-25
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
These CVEs are disputed by upstream and there is no plan to fix/address them. No other distros are carrying patches for them. There is a patch for 1010025 however it isn't merged upstream and probably carries more risk of other bugs than not having it.
--- meta/recipes-core/glibc/glibc_2.31.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+)
meta/recipes-core/glibc/glibc_2.31.bb +13 -0
@@ -5,6 +5,19 @@ CVE_CHECK_WHITELIST += "CVE-2020-10029 CVE-2020-6096 CVE-2016-10228 CVE-2020-175 CVE-2021-27645 CVE-2021-3326 CVE-2020-27618 CVE-2020-29562 CVE-2019-25013 \ " +# glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-1010022 +# glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-1010023 +# glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-1010024 +# Upstream glibc maintainers dispute there is any issue and have no plans to address it further. +# "this is being treated as a non-security bug and no real threat." +CVE_CHECK_WHITELIST += "CVE-2019-1010022 CVE-2019-1010023 CVE-2019-1010024" + +# glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-1010025 +# Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow +# easier access for another. "ASLR bypass itself is not a vulnerability." +# Potential patch at https://sourceware.org/bugzilla/show_bug.cgi?id=22853 +CVE_CHECK_WHITELIST += "CVE-2019-1010025" + DEPENDS += "gperf-native bison-native make-native" NATIVESDKFIXES ?= ""
Signature · 1 line
2.25.1
PATCH 6/22 cairo: backport patch for CVE-2020-35492
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- .../cairo/cairo/CVE-2020-35492.patch | 60 +++++++++++++++++++ meta/recipes-graphics/cairo/cairo_1.16.0.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch new file +60 -0
@@ -0,0 +1,60 @@ +Fix stack buffer overflow. + +CVE: CVE-2020-35492 +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 +From: Heiko Lewin <[email protected]> +Date: Tue, 15 Dec 2020 16:48:19 +0100 +Subject: [PATCH] Fix mask usage in image-compositor + +--- + src/cairo-image-compositor.c | 8 ++-- + test/Makefile.sources | 1 + + test/bug-image-compositor.c | 39 ++++++++++++++++++++ + test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes + 4 files changed, 44 insertions(+), 4 deletions(-) + create mode 100644 test/bug-image-compositor.c + create mode 100644 test/reference/bug-image-compositor.ref.png + +diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c +index 79ad69f68..4f8aaed99 100644 +--- a/src/cairo-image-compositor.c ++++ b/src/cairo-image-compositor.c +@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + unsigned num_spans) + { + cairo_image_span_renderer_t *r = abstract_renderer; +- uint8_t *m; ++ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); + int x0; + + if (num_spans == 0) + return CAIRO_STATUS_SUCCESS; + + x0 = spans[0].x; +- m = r->_buf; ++ m = base; + do { + int len = spans[1].x - spans[0].x; + if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { +@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + spans[0].x, y, + spans[1].x - spans[0].x, h); + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else if (spans[0].coverage == 0x0) { + if (spans[0].x != x0) { +@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + #endif + } + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else { + *m++ = spans[0].coverage; +--
meta/recipes-graphics/cairo/cairo_1.16.0.bb +1 -0
@@ -27,6 +27,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://CVE-2018-19876.patch \ file://CVE-2019-6461.patch \ file://CVE-2019-6462.patch \ + file://CVE-2020-35492.patch \ " SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
Signature · 1 line
2.25.1
PATCH 7/22 libnotify: whitelist CVE-2013-7381 (specific to the NodeJS bindings)
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- meta/recipes-gnome/libnotify/libnotify_0.7.8.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-gnome/libnotify/libnotify_0.7.8.bb +3 -0
@@ -24,3 +24,6 @@ PROVIDES += "libnotify3" RPROVIDES_${PN} += "libnotify3" RCONFLICTS_${PN} += "libnotify3" RREPLACES_${PN} += "libnotify3" + +# -7381 is specific to the NodeJS bindings +CVE_CHECK_WHITELIST += "CVE-2013-7381"
Signature · 1 line
2.25.1
PATCH 8/22 builder: whitelist CVE-2008-4178 (a different builder)
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- meta/recipes-graphics/builder/builder_0.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-graphics/builder/builder_0.1.bb +2 -0
@@ -29,3 +29,5 @@ do_install () { chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_session.sh } +# -4178 is an unrelated 'builder' +CVE_CHECK_WHITELIST = "CVE-2008-4178"
Signature · 1 line
2.25.1
PATCH 9/22 qemu: Exclude CVE-2017-5957 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The CVE applies to virglrender before 0.6.0 which we don't have.
--- meta/recipes-devtools/qemu/qemu.inc | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +3 -0
@@ -61,6 +61,9 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" +# Applies against virglrender < 0.6.0 and not qemu itself +CVE_CHECK_WHITELIST += "CVE-2017-5957" + COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null"
Signature · 1 line
2.25.1
PATCH 10/22 qemu: Exclude CVE-2007-0998 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The CVE applies to the built-in VNC server but we don't enable this by default.
--- meta/recipes-devtools/qemu/qemu.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +4 -0
@@ -64,6 +64,10 @@ SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e9 # Applies against virglrender < 0.6.0 and not qemu itself CVE_CHECK_WHITELIST += "CVE-2017-5957" +# The VNC server can expose host files uder some circumstances. We don't +# enable it by default. +CVE_CHECK_WHITELIST += "CVE-2007-0998" + COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null"
Signature · 1 line
2.25.1
PATCH 11/22 qemu: Exclude CVE-2018-18438 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The issues were investigated and found not to be an issue therefore exclude from checks.
--- meta/recipes-devtools/qemu/qemu.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +4 -0
@@ -68,6 +68,10 @@ CVE_CHECK_WHITELIST += "CVE-2017-5957" # enable it by default. CVE_CHECK_WHITELIST += "CVE-2007-0998" +# 'The issues identified by this CVE were determined to not constitute a vulnerability.' +# https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 +CVE_CHECK_WHITELIST += "CVE-2018-18438" + COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null"
Signature · 1 line
2.25.1
PATCH 12/22 jquery: Exclude CVE-2007-2379 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The CVE is non-specific and depends on the users of jquery, doesn't make sense to have this flagged against jquery as there is nothing we can do about it.
--- meta/recipes-devtools/jquery/jquery_3.5.0.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta/recipes-devtools/jquery/jquery_3.5.0.bb +5 -0
@@ -17,6 +17,11 @@ SRC_URI[map.sha256sum] = "3149351c8cbc3fb230bbf6188617c7ffda77d9e14333f4f5f0aa1a UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\d+(\.\d+)+)\.js" +# https://github.com/jquery/jquery/issues/3927 +# There are ways jquery can expose security issues but any issues are in the apps exposing them +# and there is little we can directly do +CVE_CHECK_WHITELIST += "CVE-2007-2379" + inherit allarch do_install() {
Signature · 1 line
2.25.1
PATCH 13/22 logrotate: Exclude CVE-2011-1548,1549,1550 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
These CVEs apply to the way logrotate was installed on Gentoo, Debian and SUSE, exclude from cve-check as they don't apply to OE.
--- meta/recipes-extended/logrotate/logrotate_3.15.1.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-extended/logrotate/logrotate_3.15.1.bb +3 -0
@@ -22,6 +22,9 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz SRC_URI[md5sum] = "afe109afea749c306ff489203fde6beb" SRC_URI[sha256sum] = "491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b" +# These CVEs are debian, gentoo or SUSE specific on the way logrotate was installed/used +CVE_CHECK_WHITELIST += "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" + PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" PACKAGECONFIG[acl] = ",,acl"
Signature · 1 line
2.25.1
PATCH 14/22 openssh: Exclude CVE-2007-2768 from cve-check
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
We don't build/use the OPIE PAM module, exclude the CVE from this recipe.
--- meta/recipes-connectivity/openssh/openssh_8.2p1.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-connectivity/openssh/openssh_8.2p1.bb +3 -0
@@ -28,6 +28,9 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar SRC_URI[md5sum] = "3076e6413e8dbe56d33848c1054ac091" SRC_URI[sha256sum] = "43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" +# This CVE is specific to OpenSSH with the pam opie which we don't build/use here +CVE_CHECK_WHITELIST += "CVE-2007-2768" + # This CVE is specific to OpenSSH server, as used in Fedora and Red Hat Enterprise Linux 7 # and when running in a Kerberos environment. As such it is not relevant to OpenEmbedded CVE_CHECK_WHITELIST += "CVE-2014-9278"
Signature · 1 line
2.25.1
PATCH 15/22 oeqa/qemurunner: Fix binary vs str issue
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The recent logging changes for qemurunner showed up as errors on the autobuilder where decode couldn't be called on the returned string. Since the code returns binary data, return b'' instead of '' to match to avoid tracebacks.
One of these cases was newly added, copied from the other which has been there for a long time, always broken.
--- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/utils/qemurunner.py +2 -2
@@ -646,7 +646,7 @@ class LoggingThread(threading.Thread): data = self.readsock.recv(count) except socket.error as e: if e.errno == errno.EAGAIN or e.errno == errno.EWOULDBLOCK: - return '' + return b'' else: raise
@@ -659,7 +659,7 @@ class LoggingThread(threading.Thread): # until qemu exits. if not self.canexit: raise Exception("Console connection closed unexpectedly") - return '' + return b'' return data
Signature · 1 line
2.25.1
PATCH 16/22 oeqa/qemurunner: Improve handling of run_serial for shutdown commands
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
When running a shutdown command, the serial port can close without the command returning. This is seen as the socket being readable but having no data. Change the way this case is handled in the code to avoid tracebacks.
--- meta/lib/oeqa/utils/qemurunner.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/lib/oeqa/utils/qemurunner.py +6 -1
@@ -70,6 +70,8 @@ class QemuRunner: self.monitorpipe = None self.logger = logger + # Whether we're expecting an exit and should show related errors + self.canexit = False # Enable testing other OS's # Set commands for target communication, and default to Linux ALWAYS
@@ -468,6 +470,7 @@ class QemuRunner: self.thread.join() def allowexit(self): + self.canexit = True if self.thread: self.thread.allowexit()
@@ -526,7 +529,9 @@ class QemuRunner: if re.search(self.boot_patterns['search_cmd_finished'], data): break else: - raise Exception("No data on serial console socket") + if self.canexit: + return (1, "") + raise Exception("No data on serial console socket, connection closed?") if data: if raw:
Signature · 1 line
2.25.1
PATCH 17/22 lsb-release: fix reproducibility failure
In reply to Steve SakomanFrom: Anuj Mittal <[email protected]>
Make sure help2man output is reproducible. Fixes:
| .\"·DO·NOT·MODIFY·THIS·FILE!··It·was·generated·by·help2man·1.022. .\"·DO·NOT·MODIFY·THIS·FILE!··It·was·generated·by·help2man·1.022. | .TH·FSG·"1"·"April·2021"·"FSG·lsb_release·v1.4"·FSG .TH·FSG·"1"·"May·2021"·"FSG·lsb_release·v1.4"·FSG | .SH·NAME 3 .SH·NAME
--- .../help2man-reproducibility.patch | 27 +++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch
meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch new file +27 -0
@@ -0,0 +1,27 @@ +lsb-release maintains it's own copy of help2man. Include the support +for specifying SOURCE_DATE_EPOCH from upstream. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <[email protected]> + +diff --git a/help2man b/help2man +index 13015c2..63439db 100755 +--- a/help2man ++++ b/help2man +@@ -173,7 +173,14 @@ my ($help_text, $version_text) = map { + or die "$this_program: can't get `--$_' info from $ARGV[0]\n" + } qw(help), $opt_version_key; + +-my $date = strftime "%B %Y", localtime; ++my $epoch_secs = time; ++if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) ++{ ++ $epoch_secs = $1; ++ $ENV{TZ} = 'UTC0'; ++} ++ ++my $date = strftime "%B %Y", localtime $epoch_secs; + (my $program = $ARGV[0]) =~ s!.*/!!; + my $package = $program; + my $version;
meta/recipes-extended/lsb/lsb-release_1.4.bb +1 -0
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ file://0001-Remove-timestamp-from-manpage.patch \ + file://help2man-reproducibility.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
Signature · 1 line
2.25.1
PATCH 18/22 db: update CVE_PRODUCT
In reply to Steve SakomanFrom: Chen Qi <[email protected]>
Update CVE_PRODUCT to also include 'berkeley_db'. For example, CVE-2020-2981 uses 'berkeley_db'.
--- meta/recipes-support/db/db_5.3.28.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/db/db_5.3.28.bb +1 -1
@@ -15,7 +15,7 @@ HOMEPAGE = "https://www.oracle.com/database/technologies/related/berkeleydb.html LICENSE = "Sleepycat" RCONFLICTS_${PN} = "db3" -CVE_PRODUCT = "oracle_berkeley_db" +CVE_PRODUCT = "oracle_berkeley_db berkeley_db" CVE_VERSION = "11.2.${PV}" PR = "r1"
Signature · 1 line
2.25.1
PATCH 19/22 linux-firmware: upgrade 20210208 -> 20210315
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
License-Update: additional firmware files, version changes
---
...{linux-firmware_20210208.bb => linux-firmware_20210315.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210208.bb => linux-firmware_20210315.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20210315.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb +2 -2
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=ef0565762eac313c409567b59dff00b2 \ + file://WHENCE;md5=e21a8cbddc1612bce56f06fe154a0743 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "1bcb1a3944c361507754a7d26ccff40ffc28d1fb93bce711d67da26b33e785b7" +SRC_URI[sha256sum] = "a2348f03492713dca9aef202496c6e58f5e63ee5bec6a7bdfcf8b18ce7155e70" inherit allarch
Signature · 1 line
2.25.1
PATCH 20/22 linux-yocto/5.4: qemuppc32: reduce serial shutdown issues
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Integrating the following commit(s) to linux-yocto/5.4:
qemuppc32: reduce serial issues seen on shutdown
Richard reported:
We've been seeing a lot of the qemuppc shutdown issue and I decided to
look into it. The really worrying thing looking at the logs locally is the
serial ports are showing irq issues and becoming disabled as nobody would
handle them.
Errors like:
[ 9.194886] irq 36: nobody cared (try booting with the "irqpoll" option)
[ 9.198712] CPU: 0 PID: 127 Comm: bootlogd Not tainted
[ 9.202283] Call Trace:
[ 9.205611] [d1005f00] [c00a0da8] __report_bad_irq+0x50/0x138 (unreliable)
[ 9.209347] [d1005f30] [c00a0cc0] note_interrupt+0x324/0x378
[ 9.212855] [d1005f70] [c009d138] handle_irq_event+0xe8/0x104
[ 9.216353] [d1005fa0] [c00a1d9c] handle_fasteoi_irq+0xc0/0x29c
[ 9.219960] [d1005fc0] [c009b798] generic_handle_irq+0x40/0x5c
[ 9.223496] [d1005fd0] [c00075d0] __do_irq+0x58/0x188
[ 9.226948] [d1005ff0] [c0010040] call_do_irq+0x20/0x38
[ 9.230391] [d29eda60] [c0007788] do_IRQ+0x88/0xfc
[ 9.233860] [d29eda90] [c0016454] ret_from_except+0x0/0x14
[ 9.237288] --- interrupt: 501 at __setup_irq+0x3c4/0x838
[ 9.237288] LR = __setup_irq+0x790/0x838
[ 9.244155] [d29edb88] [c009f0a4] request_threaded_irq+0x114/0x1c8
[ 9.247672] [d29edbb8] [c07a5a18] pmz_startup+0x17c/0x32c
[ 9.251203] [d29edbd8] [c07a1140] uart_port_startup+0x184/0x2f8
[ 9.254651] [d29edc08] [c07a1974] uart_port_activate+0x78/0xf4
[ 9.258141] [d29edc28] [c07839f8] tty_port_open+0xd4/0x170
[ 9.261579] [d29edc58] [c079db74] uart_open+0x2c/0x48
[ 9.265116] [d29edc68] [c077a288] tty_open+0x168/0x640
[ 9.268574] [d29edcd8] [c0280be8] chrdev_open+0x138/0x2a4
[ 9.272123] [d29edd18] [c027421c] do_dentry_open+0x228/0x410
[ 9.275643] [d29edd48] [c028e9f4] path_openat+0xb04/0xf28
[ 9.279184] [d29eddd8] [c02917e4] do_filp_open+0x120/0x164
[ 9.282535] [d29ede98] [c0276238] do_sys_openat2+0xd8/0x19c
[ 9.285790] [d29edee8] [c0276574] sys_openat+0x88/0xdc
[ 9.289096] [d29edf38] [c00160d8] ret_from_syscall+0x0/0x34
[ 9.292620] --- interrupt: c01 at 0xfec3738
[ 9.292620] LR = 0xfec36e0
[ 9.299035] handlers:
[ 9.302312] [<7f7f7da8>] pmz_interrupt
[ 9.305541] Disabling IRQ #36
(and the irqpoll option does not help)
This is problematic as the shutdown test uses the serial interface to
shut down the system. If the serial interface fails to login or run the command,
game over for the test.
CONFIG_SERIAL_PMACZILOG_CONSOLE complicates that handling, but doesn't provide
any output or capabilities that we need. So we disable it here, and
reduce the chances of issues during shutdown.--- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +1 -1
@@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "b62ae8bedb024e67e7c5cda51840454a4170c858" -SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20" +SRCREV_meta ?= "b89df7433ea8124d3092805391b78808df4147a7" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +1 -1
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "80bd6016a9bdaed4b66ddffffa8c8e62d7c1f8a6" SRCREV_machine ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85" -SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20" +SRCREV_meta ?= "b89df7433ea8124d3092805391b78808df4147a7" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +1 -1
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85" SRCREV_machine_qemux86-64 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85" SRCREV_machine_qemumips64 ?= "b36d79d6f2aaf9dadec352f611e7b9becf2b9a55" SRCREV_machine ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85" -SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20" +SRCREV_meta ?= "b89df7433ea8124d3092805391b78808df4147a7" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.25.1
PATCH 21/22 dejagnu: needs expect at runtime
In reply to Steve SakomanFrom: Romain Naour <[email protected]>
runtest return an error due to missing expect on the target. Add expect as runtime dependency.
--- meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb +1 -0
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "devel" DEPENDS += "expect-native" +RDEPENDS_${PN} = "expect" inherit autotools
Signature · 1 line
2.25.1
PATCH 22/22 linux-firmware: include all relevant files in -bcm4356
In reply to Steve SakomanFrom: Yann Dirson <[email protected]>
This currently catches the .clb_blob and .vamrs,rock960.txt, and other .txt files may come in future upstream releases.
--- meta/recipes-kernel/linux-firmware/linux-firmware_20210315.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20210315.bb +2 -2
@@ -656,8 +656,8 @@ FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio. " FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" -FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin \ - ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.bin \ +FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.* \ + ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.* \ " FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin \
Signature · 1 line
2.25.1