Patch review
cover Patch review
Please review this set of patches for dunfell and have comments back by end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1521
The following changes since commit 8a367cbbf092339a8c82c680a2565567b594b6c6:
glib-2.0: fix parsing of slim encoded tzdata (2020-10-26 15:06:51 -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):
nasm: update 2.14.02 -> 2.15.03 for CVE fixes
Steve Sakoman (1):
qemu: fix CVE-2019-20175
.../nasm/nasm/0001-stdlib-Add-strlcat.patch | 28 ++--
.../0002-Add-debug-prefix-map-option.patch | 129 +++++++-----------
.../nasm/nasm/CVE-2018-19755.patch | 116 ----------------
.../nasm/nasm/CVE-2019-14248.patch | 43 ------
.../nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} | 10 +-
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2019-20175.patch | 94 +++++++++++++
7 files changed, 161 insertions(+), 260 deletions(-)
delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2018-19755.patch
delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2019-14248.patch
rename meta/recipes-devtools/nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} (56%)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-20175.patchSignature · 1 line
2.17.1
PATCH 1/2 qemu: fix CVE-2019-20175
--- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2019-20175.patch | 94 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-20175.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -49,6 +49,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-14415.patch \ file://CVE-2020-16092.patch \ file://0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch \ + file://CVE-2019-20175.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2019-20175.patch new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/2 nasm: update 2.14.02 -> 2.15.03 for CVE fixes
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
Fixes:
CVE-2018-16517: nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-16517
CVE-2019-20334: nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-20334
CVE-2019-6290: nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-6290
CVE-2019-6291: nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-6291
CVE-2019-8343: nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-8343
Remove backported patches, rebase the rest.
Switch to using (mostly) standard autotools build.
---
.../nasm/nasm/0001-stdlib-Add-strlcat.patch | 28 ++--
.../0002-Add-debug-prefix-map-option.patch | 129 +++++++-----------
.../nasm/nasm/CVE-2018-19755.patch | 116 ----------------
.../nasm/nasm/CVE-2019-14248.patch | 43 ------
.../nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} | 10 +-
5 files changed, 66 insertions(+), 260 deletions(-)
delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2018-19755.patch
delete mode 100644 meta/recipes-devtools/nasm/nasm/CVE-2019-14248.patch
rename meta/recipes-devtools/nasm/{nasm_2.14.02.bb => nasm_2.15.03.bb} (56%)meta/recipes-devtools/nasm/nasm/0001-stdlib-Add-strlcat.patch +13 -15
@@ -1,12 +1,13 @@ -From 8a204171004fa0d7d21389530c744d215e99efb0 Mon Sep 17 00:00:00 2001 +From 1c5023002bad3a5b0bbc181fdb324160beace733 Mon Sep 17 00:00:00 2001 From: Joshua Watt <[email protected]> Date: Tue, 19 Nov 2019 12:47:30 -0600 -Subject: [PATCH 1/2] stdlib: Add strlcat +Subject: [PATCH] stdlib: Add strlcat Adds strlcat which can be used to safely concatenate strings Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635] Signed-off-by: Joshua Watt <[email protected]> + --- Makefile.in | 2 +- configure.ac | 2 ++
@@ -16,10 +17,10 @@ Signed-off-by: Joshua Watt <[email protected]> create mode 100644 stdlib/strlcat.c diff --git a/Makefile.in b/Makefile.in -index 32ef3d91..ff7eb447 100644 +index bfae1f8..156dc4c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -93,7 +93,7 @@ NASM = asm/nasm.$(O) +@@ -101,7 +101,7 @@ NASM = asm/nasm.$(O) NDISASM = disasm/ndisasm.$(O) LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
@@ -27,20 +28,20 @@ index 32ef3d91..ff7eb447 100644 + stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) stdlib/strlcat.$(O) \ \ nasmlib/ver.$(O) \ - nasmlib/crc64.$(O) nasmlib/malloc.$(O) nasmlib/errfile.$(O) \ + nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \ diff --git a/configure.ac b/configure.ac -index 38b3b596..b4e88778 100644 +index 7b72769..14fd033 100644 --- a/configure.ac +++ b/configure.ac -@@ -152,6 +152,7 @@ AC_CHECK_FUNCS([vsnprintf _vsnprintf]) - AC_CHECK_FUNCS([snprintf _snprintf]) +@@ -234,6 +234,7 @@ PA_FUNC_SNPRINTF + PA_FUNC_VSNPRINTF AC_CHECK_FUNCS([strlcpy]) AC_CHECK_FUNCS([strrchrnul]) +AC_CHECK_FUNCS([strlcat]) dnl These types are POSIX-specific, and Windows does it differently... AC_CHECK_TYPES([struct _stati64]) -@@ -170,6 +171,7 @@ AC_CHECK_DECLS(strsep) +@@ -253,6 +254,7 @@ AC_CHECK_DECLS(strsep) AC_CHECK_DECLS(strlcpy) AC_CHECK_DECLS(strnlen) AC_CHECK_DECLS(strrchrnul)
@@ -49,10 +50,10 @@ index 38b3b596..b4e88778 100644 dnl Check for missing types AC_TYPE_UINTPTR_T diff --git a/include/compiler.h b/include/compiler.h -index 4178c98e..8153d297 100644 +index b4fd3a8..7fb4821 100644 --- a/include/compiler.h +++ b/include/compiler.h -@@ -159,6 +159,10 @@ size_t strlcpy(char *, const char *, size_t); +@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t); char *strrchrnul(const char *, int); #endif
@@ -65,7 +66,7 @@ index 4178c98e..8153d297 100644 # include <stdbool.h> diff --git a/stdlib/strlcat.c b/stdlib/strlcat.c new file mode 100644 -index 00000000..7084d460 +index 0000000..7084d46 --- /dev/null +++ b/stdlib/strlcat.c @@ -0,0 +1,43 @@
@@ -112,6 +113,3 @@ index 00000000..7084d460 + +#endif + --- -2.23.0 -
meta/recipes-devtools/nasm/nasm/0002-Add-debug-prefix-map-option.patch +50 -79
254 lines not on this page · raw message
meta/recipes-devtools/nasm/nasm/CVE-2018-19755.patch deleted +0 -116
116 lines not on this page · raw message
meta/recipes-devtools/nasm/nasm/CVE-2019-14248.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-devtools/nasm/nasm_2.15.03.bb renamed from meta/recipes-devtools/nasm/nasm_2.14.02.bb +3 -7
@@ -4,19 +4,15 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ - file://CVE-2018-19755.patch \ - file://CVE-2019-14248.patch \ file://0001-stdlib-Add-strlcat.patch \ file://0002-Add-debug-prefix-map-option.patch \ " -SRC_URI[md5sum] = "3f489aa48ad2aa1f967dc5e293bbd06f" -SRC_URI[sha256sum] = "34fd26c70a277a9fdd54cb5ecf389badedaf48047b269d1008fbc819b24e80bc" +SRC_URI[sha256sum] = "04e7343d9bf112bffa9fda86f6c7c8b120c2ccd700b882e2db9f57484b1bd778" -# brokensep since this uses autoconf but not automake -inherit autotools-brokensep +EXTRA_AUTORECONF_append = " -I autoconf/m4" -EXTRA_AUTORECONF += "--exclude=aclocal" +inherit autotools BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1