Patch review
cover Patch review
Please review this next set of patches for dunfell and have comments back by end of day Tuesday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1560
The following changes since commit 8d54034bb8e522f9827ec6422b32cbd4e5bf1346:
sqlite3: fix CVE-2020-13632 (2020-11-05 04:07:15 -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 20200817 -> 20201022
Chee Yang Lee (1):
ruby: fix CVE-2020-25613
Khem Raj (1):
qemuboot.bbclass: Fix a typo
Max Krummenacher (2):
linux-firmware: package marvel sdio 8997 firmware
linux-firmware: package nvidia firmware
Maxime Roussin-Bélanger (1):
meta: fix some unresponsive homepages and bugtracker links
Mingli Yu (1):
update_udev_hwdb: clean hwdb.bin
Neil Armstrong (1):
linux-firmware: add Amlogic VDEC firmware package
Steve Sakoman (2):
netbase: update SRC_URI to reflect new file name
netbase: bump PE to purge bogus hash equivalence from autobuilder
Yongxin Liu (2):
grub: fix several CVEs in grub 2.04
grub: clean up CVE patches
meta/classes/qemuboot.bbclass | 2 +-
...308-calloc-Use-calloc-at-most-places.patch | 1863 +++++++++++++++++
...low-checking-primitives-where-we-do-.patch | 1330 ++++++++++++
...se-after-free-when-redefining-a-func.patch | 117 ++
...er-overflows-in-initrd-size-handling.patch | 177 ++
...-we-always-have-an-overflow-checking.patch | 246 +++
...dd-LVM-cache-logical-volume-handling.patch | 287 +++
...e-arithmetic-primitives-that-check-f.patch | 94 +
...used-fields-from-grub_script_functio.patch | 37 +
meta/recipes-bsp/grub/grub2.inc | 8 +
meta/recipes-bsp/v86d/v86d_0.1.10.bb | 2 +-
.../recipes-connectivity/bind/bind_9.11.22.bb | 2 +-
meta/recipes-connectivity/iw/iw_5.4.bb | 2 +-
meta/recipes-core/netbase/netbase_6.1.bb | 9 +-
meta/recipes-core/readline/readline.inc | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 4 +-
meta/recipes-devtools/chrpath/chrpath_0.16.bb | 3 +-
meta/recipes-devtools/ninja/ninja_1.10.0.bb | 2 +-
.../ruby/ruby/CVE-2020-25613.patch | 40 +
meta/recipes-devtools/ruby/ruby_2.7.1.bb | 1 +
meta/recipes-extended/lsb/lsb-release_1.4.bb | 2 +-
.../recipes-extended/minicom/minicom_2.7.1.bb | 2 +-
meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb | 2 +-
meta/recipes-extended/which/which_2.21.bb | 2 +-
meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +-
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 3 +-
meta/recipes-kernel/kmod/kmod.inc | 2 +-
...20200817.bb => linux-firmware_20201022.bb} | 51 +-
.../wireless-regdb_2020.04.29.bb | 2 +-
.../libvorbis/libvorbis_1.3.6.bb | 4 +-
.../settings-daemon/settings-daemon_0.0.2.bb | 2 +-
meta/recipes-support/atk/atk_2.34.1.bb | 5 +-
.../bash-completion/bash-completion_2.10.bb | 4 +-
meta/recipes-support/npth/npth_1.6.bb | 4 +-
scripts/postinst-intercepts/update_udev_hwdb | 1 +
35 files changed, 4279 insertions(+), 37 deletions(-)
create mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-Use-calloc-at-most-places.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch
create mode 100644 meta/recipes-bsp/grub/files/calloc-Make-sure-we-always-have-an-overflow-checking.patch
create mode 100644 meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical-volume-handling.patch
create mode 100644 meta/recipes-bsp/grub/files/safemath-Add-some-arithmetic-primitives-that-check-f.patch
create mode 100644 meta/recipes-bsp/grub/files/script-Remove-unused-fields-from-grub_script_functio.patch
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2020-25613.patch
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200817.bb => linux-firmware_20201022.bb} (95%)Signature · 1 line
2.17.1
PATCH 1/12 meta: fix some unresponsive homepages and bugtracker links
From: Maxime Roussin-Bélanger <[email protected]>
remove some extra whitespaces
--- meta/recipes-bsp/v86d/v86d_0.1.10.bb | 2 +- meta/recipes-connectivity/bind/bind_9.11.22.bb | 2 +- meta/recipes-connectivity/iw/iw_5.4.bb | 2 +- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-core/util-linux/util-linux.inc | 4 ++-- meta/recipes-devtools/chrpath/chrpath_0.16.bb | 3 +-- meta/recipes-devtools/ninja/ninja_1.10.0.bb | 2 +- meta/recipes-extended/lsb/lsb-release_1.4.bb | 2 +- meta/recipes-extended/minicom/minicom_2.7.1.bb | 2 +- meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb | 2 +- meta/recipes-extended/which/which_2.21.bb | 2 +- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +- meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 3 +-- meta/recipes-kernel/kmod/kmod.inc | 2 +- .../wireless-regdb/wireless-regdb_2020.04.29.bb | 2 +- meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb | 4 ++-- meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | 2 +- meta/recipes-support/atk/atk_2.34.1.bb | 5 ++--- meta/recipes-support/bash-completion/bash-completion_2.10.bb | 4 ++-- meta/recipes-support/npth/npth_1.6.bb | 4 ++-- 20 files changed, 25 insertions(+), 28 deletions(-)
meta/recipes-bsp/v86d/v86d_0.1.10.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "User support binary for the uvesafb kernel module" -HOMEPAGE = "http://dev.gentoo.org/~spock/projects/uvesafb/" +HOMEPAGE = "https://tracker.debian.org/pkg/v86d" # the copyright info is at the bottom of README, expect break LICENSE = "GPLv2"
meta/recipes-connectivity/bind/bind_9.11.22.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "ISC Internet Domain Name Server" -HOMEPAGE = "http://www.isc.org/sw/bind/" +HOMEPAGE = "https://www.isc.org/bind/" SECTION = "console/network" LICENSE = "ISC & BSD"
meta/recipes-connectivity/iw/iw_5.4.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "nl80211 based CLI configuration utility for wireless devices" DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \ wireless devices. It supports almost all new drivers that have been added \ to the kernel recently. " -HOMEPAGE = "http://wireless.kernel.org/en/users/Documentation/iw" +HOMEPAGE = "https://wireless.wiki.kernel.org/en/users/documentation/iw" SECTION = "base" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
meta/recipes-core/readline/readline.inc +1 -1
@@ -4,7 +4,7 @@ command lines as they are typed in. Both Emacs and vi editing modes are availabl additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those \ lines, and perform csh-like history expansion on previous commands." SECTION = "libs" -HOMEPAGE = "https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +HOMEPAGE = "https://tiswww.case.edu/php/chet/readline/rltop.html" # GPLv2+ (< 6.0), GPLv3+ (>= 6.0) LICENSE = "GPLv3+"
meta/recipes-core/util-linux/util-linux.inc +2 -2
@@ -1,5 +1,5 @@ SUMMARY = "A suite of basic system administration utilities" -HOMEPAGE = "http://userweb.kernel.org/~kzak/util-linux/" +HOMEPAGE = "https://en.wikipedia.org/wiki/Util-linux" DESCRIPTION = "Util-linux includes a suite of basic system administration utilities \ commonly found on most Linux systems. Some of the more important utilities include \ disk partitioning, kernel message management, filesystem creation, and system login."
@@ -113,7 +113,7 @@ EXTRA_OECONF_append = " --disable-hwclock-gplv3" # PACKAGECONFIG ?= "pcre2" PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -# inherit manpages requires this to be present, however util-linux does not have +# inherit manpages requires this to be present, however util-linux does not have # configuration options, and installs manpages always PACKAGECONFIG[manpages] = "" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
meta/recipes-devtools/chrpath/chrpath_0.16.bb +1 -2
@@ -2,8 +2,7 @@ SUMMARY = "Tool to edit rpath in ELF binaries" DESCRIPTION = "chrpath allows you to change the rpath (where the \ application looks for libraries) in an application. It does not \ (yet) allow you to add an rpath if there isn't one already." -HOMEPAGE = "http://alioth.debian.org/projects/chrpath/" -BUGTRACKER = "http://alioth.debian.org/tracker/?atid=412807&group_id=31052" +HOMEPAGE = "https://tracker.debian.org/pkg/chrpath" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
meta/recipes-devtools/ninja/ninja_1.10.0.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "Ninja is a small build system with a focus on speed." -HOMEPAGE = "http://martine.github.com/ninja/" +HOMEPAGE = "https://ninja-build.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
meta/recipes-extended/lsb/lsb-release_1.4.bb +1 -1
@@ -1,6 +1,6 @@ SUMMARY = "lsb_release support for OpenEmbedded" SECTION = "console/utils" -HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" +HOMEPAGE = "https://sourceforge.net/projects/lsb/files" LICENSE = "GPLv2+" # lsb_release needs getopt
meta/recipes-extended/minicom/minicom_2.7.1.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "Text-based modem control and terminal emulation program" -HOMEPAGE = "http://alioth.debian.org/projects/minicom/" +HOMEPAGE = "https://salsa.debian.org/minicom-team/minicom" DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems" SECTION = "console/network" DEPENDS = "ncurses virtual/libiconv"
meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "PBZIP2 is a parallel implementation of the bzip2 block-sorting \ file compressor that uses pthreads and achieves near-linear speedup on SMP \ machines. The output of this version is fully compatible with bzip2 v1.0.2 or \ newer (ie: anything compressed with pbzip2 can be decompressed with bzip2)." -HOMEPAGE = "http://compression.ca/pbzip2/" +HOMEPAGE = "https://launchpad.net/pbzip2/" SECTION = "console/utils" LICENSE = "bzip2-1.0.6" LIC_FILES_CHKSUM = "file://COPYING;md5=398b8832c6f840cfebd20ab2be6a3743"
meta/recipes-extended/which/which_2.21.bb +1 -1
@@ -4,7 +4,7 @@ executables that bash(1) would execute when the passed \ program names would have been entered on the shell prompt. \ It does this by using the exact same algorithm as bash." SECTION = "libs" -HOMEPAGE = "http://carlo17.home.xs4all.nl/which/" +HOMEPAGE = "https://carlowood.github.io/which/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
meta/recipes-gnome/gnome/gconf_3.2.6.bb +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "GConf is a system for storing application preferences. \ It is intended for user preferences; not configuration of something like \ Apache, or arbitrary data storage." SECTION = "x11/gnome" -HOMEPAGE = "https://projects.gnome.org/gconf/" +HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +1 -2
@@ -1,7 +1,7 @@ SUMMARY = "Documentation generator for glib-based software" DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ from glib-based software and produce a set of html documentation files from them" -HOMEPAGE = "http://www.gtk.org/gtk-doc/" +HOMEPAGE = "https://www.gtk.org/docs/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -59,4 +59,3 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } -
meta/recipes-kernel/kmod/kmod.inc +1 -1
@@ -4,7 +4,7 @@ SUMMARY = "Tools for managing Linux kernel modules" DESCRIPTION = "kmod is a set of tools to handle common tasks with Linux kernel modules like \ insert, remove, list, check properties, resolve dependencies and aliases." -HOMEPAGE = "http://packages.profusion.mobi/kmod/" +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/" LICENSE = "GPL-2.0+ & LGPL-2.1+" LICENSE_libkmod = "LGPL-2.1+" SECTION = "base"
meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "Wireless Central Regulatory Domain Database" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" +HOMEPAGE = "https://wireless.wiki.kernel.org/en/developers/regulatory/crda" SECTION = "net" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb +2 -2
@@ -2,8 +2,8 @@ SUMMARY = "Ogg Vorbis Audio Codec" DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \ that is free of intellectual property restrictions. libvorbis \ is the main vorbis codec library." -HOMEPAGE = "http://www.vorbis.com/" -BUGTRACKER = "https://trac.xiph.org" +HOMEPAGE = "https://xiph.org/vorbis/" +BUGTRACKER = "https://gitlab.xiph.org/xiph/vorbis/-/issues" SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=70c7063491d2d9f76a098d62ed5134f1 \
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +1 -1
@@ -1,5 +1,5 @@ SUMMARY = "Provides a bridge between gconf and xsettings" -HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" +HOMEPAGE = "https://git.yoctoproject.org/cgit/cgit.cgi/xsettings-daemon/" BUGTRACKER = "http://bugzilla.yoctoproject.org/" LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
meta/recipes-support/atk/atk_2.34.1.bb +2 -3
@@ -1,6 +1,6 @@ SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" +HOMEPAGE = "https://wiki.gnome.org/Accessibility" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/atk/-/issues" SECTION = "x11/libs" LICENSE = "GPLv2+ & LGPLv2+"
@@ -18,4 +18,3 @@ SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -
meta/recipes-support/bash-completion/bash-completion_2.10.bb +2 -2
@@ -1,6 +1,6 @@ SUMMARY = "Programmable Completion for Bash 4" -HOMEPAGE = "http://bash-completion.alioth.debian.org/" -BUGTRACKER = "https://alioth.debian.org/projects/bash-completion/" +HOMEPAGE = "https://github.com/scop/bash-completion" +BUGTRACKER = "https://github.com/scop/bash-completion/issues" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
meta/recipes-support/npth/npth_1.6.bb +2 -2
@@ -1,5 +1,5 @@ SUMMARY = "New GNU Portable Threads library" -HOMEPAGE = "http://www.gnupg.org/software/pth/" +HOMEPAGE = "https://www.gnu.org/software/pth/" SECTION = "libs" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "\
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1da BINCONFIG = "${bindir}/npth-config" -inherit autotools binconfig-disabled multilib_header +inherit autotools binconfig-disabled multilib_header FILES_${PN} = "${libdir}/libnpth.so.*" FILES_${PN}-dev += "${bindir}/npth-config"
Signature · 1 line
2.17.1
PATCH 2/12 qemuboot.bbclass: Fix a typo
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
--- meta/classes/qemuboot.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/qemuboot.bbclass +1 -1
@@ -40,7 +40,7 @@ # QB_NETWORK_DEVICE_prepend might be used, since Qemu enumerates the eth* # devices in reverse order to -device arguments. # -# QB_TAP_OPT: netowrk option for 'tap' mode, e.g., +# QB_TAP_OPT: network option for 'tap' mode, e.g., # "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" # Note, runqemu will replace "@TAP@" with the one which is used, such as tap0, tap1 ... #
Signature · 1 line
2.17.1
PATCH 3/12 update_udev_hwdb: clean hwdb.bin
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
Steps to reproduce:
echo "IMAGE_INSTALL_append = \" udev-hwdb lib32-udev-hwdb\"" >> conf/local.conf
When install both udev-hwdb and lib32-udev-hwdb as above, there comes below do_populate_sdk error:
$ bitbake core-image-sato -c populate_sdk ERROR: Task (/path/core-image-sato.bb:do_populate_sdk) failed with exit code '134' NOTE: Tasks Summary: Attempted 5554 tasks of which 0 didn't need to be rerun and 1 failed.
$ cat /path/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r5/pseudo/pseudo.log [snip] inode mismatch: '/path/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r5/sdk/image/usr/local/oecore-x86_64/sysroots/core2-64-poky-linux/lib/udev/hwdb.bin' ino 427383040 in db, 427383042 in request. [snip]
It is because both udev-hwdb and lib32-udev-hwdb will generate ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/udev/hwdb.bin during do_populate_sdk and it triggers pseudo error.
So clean hwdb.bin before generate hwdb.bin to avoid conflict to fix the above do_populate_sdk error.
--- scripts/postinst-intercepts/update_udev_hwdb | 1 + 1 file changed, 1 insertion(+)
scripts/postinst-intercepts/update_udev_hwdb +1 -0
@@ -17,5 +17,6 @@ case "${PREFERRED_PROVIDER_udev}" in ;; esac +rm -f $D${UDEVLIBDIR}/udev/hwdb.bin PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}udevadm hwdb --update --root $D ${UDEV_EXTRA_ARGS} chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin
Signature · 1 line
2.17.1
PATCH 4/12 linux-firmware: add Amlogic VDEC firmware package
In reply to Steve SakomanFrom: Neil Armstrong <[email protected]>
Add package for the Amlogic VDEC firmwares.
--- .../linux-firmware/linux-firmware_20200817.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +8 -0
@@ -294,6 +294,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ + ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ ${PN}-whence-license \ ${PN}-license \ "
@@ -881,6 +882,12 @@ RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" +# For Amlogic VDEC +LICENSE_${PN}-amlogic-vdec = "Firmware-amlogic_vdec" +FILES_${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic_vdec" +FILES_${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*" +RDEPENDS_${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license" + # For other firmwares # Maybe split out to separate packages when needed. LICENSE_${PN} = "\
@@ -888,6 +895,7 @@ LICENSE_${PN} = "\ & Firmware-agere \ & Firmware-amdgpu \ & Firmware-amd-ucode \ + & Firmware-amlogic_vdec \ & Firmware-atmel \ & Firmware-ca0132 \ & Firmware-cavium \
Signature · 1 line
2.17.1
PATCH 5/12 linux-firmware: package marvel sdio 8997 firmware
In reply to Steve SakomanFrom: Max Krummenacher <[email protected]>
Add package for the firmware required by the Marvell 8997 chipset when connected over SDIO.
--- .../linux-firmware/linux-firmware_20200817.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +13 -2
@@ -218,8 +218,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-mt7601u-license ${PN}-mt7601u \ ${PN}-radeon-license ${PN}-radeon \ ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ - ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \ - ${PN}-usb8997 \ + ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ + ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \
@@ -404,6 +404,7 @@ LICENSE_${PN}-sd8797 = "Firmware-Marvell" LICENSE_${PN}-sd8801 = "Firmware-Marvell" LICENSE_${PN}-sd8887 = "Firmware-Marvell" LICENSE_${PN}-sd8897 = "Firmware-Marvell" +LICENSE_${PN}-sd8997 = "Firmware-Marvell" LICENSE_${PN}-usb8997 = "Firmware-Marvell" LICENSE_${PN}-marvell-license = "Firmware-Marvell"
@@ -439,6 +440,15 @@ FILES_${PN}-sd8887 = " \ FILES_${PN}-sd8897 = " \ ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ " +do_install_append() { + # The kernel 5.6.x driver still uses the old name, provide a symlink for + # older kernels + ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin +} +FILES_${PN}-sd8997 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ + ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ +" FILES_${PN}-usb8997 = " \ ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ "
@@ -450,6 +460,7 @@ RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" # For netronome
Signature · 1 line
2.17.1
PATCH 6/12 linux-firmware: package nvidia firmware
In reply to Steve SakomanFrom: Max Krummenacher <[email protected]>
Add packages for the firmware required by the Nvidia chipsets. Split it in Tegra K1, all other Tegras and desktop GPU packages.
--- .../linux-firmware/linux-firmware_20200817.bb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+)
meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +24 -0
@@ -288,6 +288,9 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ ${PN}-bnx2-mips \ ${PN}-liquidio \ + ${PN}-nvidia-license \ + ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ + ${PN}-nvidia-gpu \ ${PN}-netronome-license ${PN}-netronome \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \
@@ -478,6 +481,27 @@ FILES_${PN}-netronome = " \ RDEPENDS_${PN}-netronome += "${PN}-netronome-license" +# For Nvidia +LICENSE_${PN}-nvidia-gpu = "Firmware-nvidia" +LICENSE_${PN}-nvidia-tegra = "Firmware-nvidia" +LICENSE_${PN}-nvidia-tegra-k1 = "Firmware-nvidia" +LICENSE_${PN}-nvidia-license = "Firmware-nvidia" + +FILES_${PN}-nvidia-gpu = "${nonarch_base_libdir}/firmware/nvidia" +FILES_${PN}-nvidia-tegra = " \ + ${nonarch_base_libdir}/firmware/nvidia/tegra* \ + ${nonarch_base_libdir}/firmware/nvidia/gm20b \ + ${nonarch_base_libdir}/firmware/nvidia/gp10b \ +" +FILES_${PN}-nvidia-tegra-k1 = " \ + ${nonarch_base_libdir}/firmware/nvidia/tegra124 \ + ${nonarch_base_libdir}/firmware/nvidia/gk20a \ +" +FILES_${PN}-nvidia-license = "${nonarch_base_libdir}/firmware/LICENCE.nvidia" + +RDEPENDS_${PN}-nvidia-gpu += "${PN}-nvidia-license" +RDEPENDS_${PN}-nvidia-tegra += "${PN}-nvidia-license" + # For rtl LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware"
Signature · 1 line
2.17.1
PATCH 7/12 linux-firmware: upgrade 20200817 -> 20201022
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
License-Update: WHENCE file names updates
---
...{linux-firmware_20200817.bb => linux-firmware_20201022.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200817.bb => linux-firmware_20201022.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20201022.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +2 -2
@@ -126,7 +126,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=4d229f79f8770b5b2c4aac655b9fabef \ + file://WHENCE;md5=daf28db5d6353de0a886f08106cffa22 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -198,7 +198,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "76d05d5f1eff268d3b80675245fa596f557bd55ee2e16ddd54d18ffeae943887" +SRC_URI[sha256sum] = "bf586e0beb4c65f22bf0a79811f259aa0a5a7cc9f70eebecb260525b6914cef7" inherit allarch
Signature · 1 line
2.17.1
PATCH 8/12 netbase: update SRC_URI to reflect new file name
In reply to Steve SakomanThe netbase_6.1.tar.xz file was removed and replaced with netbase_6.1_bpo10+1.tar.xz. File contents are identical except for the changelog:
$ diff -rup netbase-6.1 netbase-6.1~bpo10+1/ diff -rup netbase-6.1/debian/changelog netbase-6.1~bpo10+1/debian/changelog --- netbase-6.1/debian/changelog 2020-02-16 13:22:04.000000000 -1000 +++ netbase-6.1~bpo10+1/debian/changelog 2020-08-26 23:10:59.000000000 -1000 @@ -1,3 +1,9 @@ +netbase (6.1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. (Closes: #969058) + + -- Arturo Borrero Gonzalez <[email protected]> Thu, 27 Aug 2020 11:10:59 +0200 + netbase (6.1) unstable; urgency=medium
* services: added isakmp (500/udp) which was removed by mistake in
[YOCTO #14084]
--- meta/recipes-core/netbase/netbase_6.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-core/netbase/netbase_6.1.bb +4 -3
@@ -6,10 +6,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" PE = "1" -SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}~bpo10+1.tar.xz" +S = "${WORKDIR}/${BPN}-${PV}~bpo10+1" -SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55" -SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8" +SRC_URI[md5sum] = "4fa7517285b4045ac0dc8dbf6730dd7a" +SRC_URI[sha256sum] = "4e9c3082dff8896cb6b6bea9bb2200d82fb0d7c8d8c8fc9b18704fe553316237" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () {
Signature · 1 line
2.17.1
PATCH 9/12 netbase: bump PE to purge bogus hash equivalence from autobuilder
In reply to Steve Sakoman--- meta/recipes-core/netbase/netbase_6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/netbase/netbase_6.1.bb +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://packages.debian.org/netbase" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" -PE = "1" +PE = "2" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}~bpo10+1.tar.xz" S = "${WORKDIR}/${BPN}-${PV}~bpo10+1"
Signature · 1 line
2.17.1
PATCH 10/12 ruby: fix CVE-2020-25613
In reply to Steve SakomanFrom: Chee Yang Lee <[email protected]>
--- .../ruby/ruby/CVE-2020-25613.patch | 40 +++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.7.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2020-25613.patch
meta/recipes-devtools/ruby/ruby/CVE-2020-25613.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 8946bb38b4d87549f0d99ed73c62c41933f97cc7 Mon Sep 17 00:00:00 2001 +From: Yusuke Endoh <[email protected]> +Date: Tue, 29 Sep 2020 13:15:58 +0900 +Subject: [PATCH] Make it more strict to interpret some headers + +Some regexps were too tolerant. + +Upstream-Status: Backport +[https://github.com/ruby/webrick/commit/8946bb38b4d87549f0d99ed73c62c41933f97cc7] +CVE: CVE-2020-25613 +Signed-off-by: Chee Yang Lee <[email protected]> +--- + lib/webrick/httprequest.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb +index 294bd91..d34eac7 100644 +--- a/lib/webrick/httprequest.rb ++++ b/lib/webrick/httprequest.rb +@@ -227,9 +227,9 @@ def parse(socket=nil) + raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'." + end + +- if /close/io =~ self["connection"] ++ if /\Aclose\z/io =~ self["connection"] + @keep_alive = false +- elsif /keep-alive/io =~ self["connection"] ++ elsif /\Akeep-alive\z/io =~ self["connection"] + @keep_alive = true + elsif @http_version < "1.1" + @keep_alive = false +@@ -508,7 +508,7 @@ def read_body(socket, block) + return unless socket + if tc = self['transfer-encoding'] + case tc +- when /chunked/io then read_chunked(socket, block) ++ when /\Achunked\z/io then read_chunked(socket, block) + else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}." + end + elsif self['content-length'] || @remaining_size
meta/recipes-devtools/ruby/ruby_2.7.1.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI += " \ file://remove_has_include_macros.patch \ file://run-ptest \ file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ + file://CVE-2020-25613.patch \ " SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909"
Signature · 1 line
2.17.1
PATCH 11/12 grub: fix several CVEs in grub 2.04
In reply to Steve SakomanFrom: Yongxin Liu <[email protected]>
Backport patches from https://git.savannah.gnu.org/git/grub.git
to fix some CVEs. Here is the list.
CVE-2020-14308:
0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch 0002-lvm-Add-LVM-cache-logical-volume-handling.patch 0003-calloc-Use-calloc-at-most-places.patch
CVE-2020-14309, CVE-2020-14310, CVE-2020-14311:
0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch 0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch
CVE-2020-15706:
0006-script-Remove-unused-fields-from-grub_script_functio.patch 0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch
CVE-2020-15707:
0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch
--- ...-we-always-have-an-overflow-checking.patch | 246 +++ ...dd-LVM-cache-logical-volume-handling.patch | 287 +++ ...003-calloc-Use-calloc-at-most-places.patch | 1859 +++++++++++++++++ ...e-arithmetic-primitives-that-check-f.patch | 94 + ...low-checking-primitives-where-we-do-.patch | 1326 ++++++++++++ ...used-fields-from-grub_script_functio.patch | 37 + ...se-after-free-when-redefining-a-func.patch | 113 + ...er-overflows-in-initrd-size-handling.patch | 173 ++ meta/recipes-bsp/grub/grub2.inc | 8 + 9 files changed, 4143 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch create mode 100644 meta/recipes-bsp/grub/files/0002-lvm-Add-LVM-cache-logical-volume-handling.patch create mode 100644 meta/recipes-bsp/grub/files/0003-calloc-Use-calloc-at-most-places.patch create mode 100644 meta/recipes-bsp/grub/files/0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch create mode 100644 meta/recipes-bsp/grub/files/0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch create mode 100644 meta/recipes-bsp/grub/files/0006-script-Remove-unused-fields-from-grub_script_functio.patch create mode 100644 meta/recipes-bsp/grub/files/0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch create mode 100644 meta/recipes-bsp/grub/files/0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch
meta/recipes-bsp/grub/files/0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch new file +246 -0
@@ -0,0 +1,246 @@ +From c005f62f5c4b26a77b916c8f76a852324439ecb3 Mon Sep 17 00:00:00 2001 +From: Peter Jones <[email protected]> +Date: Mon, 15 Jun 2020 12:15:29 -0400 +Subject: [PATCH 2/9] calloc: Make sure we always have an overflow-checking + calloc() available + +This tries to make sure that everywhere in this source tree, we always have +an appropriate version of calloc() (i.e. grub_calloc(), xcalloc(), etc.) +available, and that they all safely check for overflow and return NULL when +it would occur. + +Upstream-Status: Backport [commit 64e26162ebfe68317c143ca5ec996c892019f8f8 +from https://git.savannah.gnu.org/git/grub.git] + +Signed-off-by: Peter Jones <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Yongxin Liu <[email protected]> +--- + grub-core/kern/emu/misc.c | 12 ++++++++++++ + grub-core/kern/emu/mm.c | 10 ++++++++++ + grub-core/kern/mm.c | 40 ++++++++++++++++++++++++++++++++++++++ + grub-core/lib/libgcrypt_wrap/mem.c | 11 +++++++++-- + grub-core/lib/posix_wrap/stdlib.h | 8 +++++++- + include/grub/emu/misc.h | 1 + + include/grub/mm.h | 6 ++++++ + 7 files changed, 85 insertions(+), 3 deletions(-) + +diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c +index 65db79b..dfd8a8e 100644 +--- a/grub-core/kern/emu/misc.c ++++ b/grub-core/kern/emu/misc.c +@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...) + exit (1); + } + ++void * ++xcalloc (grub_size_t nmemb, grub_size_t size) ++{ ++ void *p; ++ ++ p = calloc (nmemb, size); ++ if (!p) ++ grub_util_error ("%s", _("out of memory")); ++ ++ return p; ++} ++ + void * + xmalloc (grub_size_t size) + { +diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c +index f262e95..145b01d 100644 +--- a/grub-core/kern/emu/mm.c ++++ b/grub-core/kern/emu/mm.c +@@ -25,6 +25,16 @@ + #include <string.h> + #include <grub/i18n.h> + ++void * ++grub_calloc (grub_size_t nmemb, grub_size_t size) ++{ ++ void *ret; ++ ret = calloc (nmemb, size); ++ if (!ret) ++ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); ++ return ret; ++} ++ + void * + grub_malloc (grub_size_t size) + { +diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c +index ee88ff6..f2822a8 100644 +--- a/grub-core/kern/mm.c ++++ b/grub-core/kern/mm.c +@@ -67,8 +67,10 @@ + #include <grub/dl.h> + #include <grub/i18n.h> + #include <grub/mm_private.h> ++#include <grub/safemath.h> + + #ifdef MM_DEBUG ++# undef grub_calloc + # undef grub_malloc + # undef grub_zalloc + # undef grub_realloc +@@ -375,6 +377,30 @@ grub_memalign (grub_size_t align, grub_size_t size) + return 0; + } + ++/* ++ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on ++ * integer overflow. ++ */ ++void * ++grub_calloc (grub_size_t nmemb, grub_size_t size) ++{ ++ void *ret; ++ grub_size_t sz = 0; ++ ++ if (grub_mul (nmemb, size, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ return NULL; ++ } ++ ++ ret = grub_memalign (0, sz); ++ if (!ret) ++ return NULL; ++ ++ grub_memset (ret, 0, sz); ++ return ret; ++} ++ + /* Allocate SIZE bytes and return the pointer. */ + void * + grub_malloc (grub_size_t size) +@@ -561,6 +587,20 @@ grub_mm_dump (unsigned lineno) + grub_printf ("\n"); + } + ++void * ++grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t size) ++{ ++ void *ptr; ++ ++ if (grub_mm_debug) ++ grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ", ++ file, line, size); ++ ptr = grub_calloc (nmemb, size); ++ if (grub_mm_debug) ++ grub_printf ("%p\n", ptr); ++ return ptr; ++} ++ + void * + grub_debug_malloc (const char *file, int line, grub_size_t size) + { +diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c +index beeb661..74c6eaf 100644 +--- a/grub-core/lib/libgcrypt_wrap/mem.c ++++ b/grub-core/lib/libgcrypt_wrap/mem.c +@@ -4,6 +4,7 @@ + #include <grub/crypto.h> + #include <grub/dl.h> + #include <grub/env.h> ++#include <grub/safemath.h> + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -36,7 +37,10 @@ void * + gcry_xcalloc (size_t n, size_t m) + { + void *ret; +- ret = grub_zalloc (n * m); ++ size_t sz; ++ if (grub_mul (n, m, &sz)) ++ grub_fatal ("gcry_xcalloc would overflow"); ++ ret = grub_zalloc (sz); + if (!ret) + grub_fatal ("gcry_xcalloc failed"); + return ret; +@@ -56,7 +60,10 @@ void * + gcry_xcalloc_secure (size_t n, size_t m) + { + void *ret; +- ret = grub_zalloc (n * m); ++ size_t sz; ++ if (grub_mul (n, m, &sz)) ++ grub_fatal ("gcry_xcalloc would overflow"); ++ ret = grub_zalloc (sz); + if (!ret) + grub_fatal ("gcry_xcalloc failed"); + return ret; +diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h +index 3b46f47..7a8d385 100644 +--- a/grub-core/lib/posix_wrap/stdlib.h ++++ b/grub-core/lib/posix_wrap/stdlib.h +@@ -21,6 +21,7 @@ + + #include <grub/mm.h> + #include <grub/misc.h> ++#include <grub/safemath.h> + + static inline void + free (void *ptr) +@@ -37,7 +38,12 @@ malloc (grub_size_t size) + static inline void * + calloc (grub_size_t size, grub_size_t nelem) + { +- return grub_zalloc (size * nelem); ++ grub_size_t sz; ++ ++ if (grub_mul (size, nelem, &sz)) ++ return NULL; ++ ++ return grub_zalloc (sz); + } + + static inline void * +diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h +index ce464cf..ff9c48a 100644 +--- a/include/grub/emu/misc.h ++++ b/include/grub/emu/misc.h +@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev); + #define GRUB_HOST_PRIuLONG_LONG "llu" + #define GRUB_HOST_PRIxLONG_LONG "llx" + ++void * EXPORT_FUNC(xcalloc) (grub_size_t nmemb, grub_size_t size) WARN_UNUSED_RESULT; + void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT; + void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT; + char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT; +diff --git a/include/grub/mm.h b/include/grub/mm.h +index 28e2e53..9c38dd3 100644 +--- a/include/grub/mm.h ++++ b/include/grub/mm.h +@@ -29,6 +29,7 @@ + #endif + + void grub_mm_init_region (void *addr, grub_size_t size); ++void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size); + void *EXPORT_FUNC(grub_malloc) (grub_size_t size); + void *EXPORT_FUNC(grub_zalloc) (grub_size_t size); + void EXPORT_FUNC(grub_free) (void *ptr); +@@ -48,6 +49,9 @@ extern int EXPORT_VAR(grub_mm_debug); + void grub_mm_dump_free (void); + void grub_mm_dump (unsigned lineno); + ++#define grub_calloc(nmemb, size) \ ++ grub_debug_calloc (GRUB_FILE, __LINE__, nmemb, size) ++ + #define grub_malloc(size) \ + grub_debug_malloc (GRUB_FILE, __LINE__, size) + +@@ -63,6 +67,8 @@ void grub_mm_dump (unsigned lineno); + #define grub_free(ptr) \ + grub_debug_free (GRUB_FILE, __LINE__, ptr) + ++void *EXPORT_FUNC(grub_debug_calloc) (const char *file, int line, ++ grub_size_t nmemb, grub_size_t size); + void *EXPORT_FUNC(grub_debug_malloc) (const char *file, int line, + grub_size_t size); + void *EXPORT_FUNC(grub_debug_zalloc) (const char *file, int line, +-- +2.14.4 +
meta/recipes-bsp/grub/files/0002-lvm-Add-LVM-cache-logical-volume-handling.patch new file +287 -0
287 lines not on this page · raw message
meta/recipes-bsp/grub/files/0003-calloc-Use-calloc-at-most-places.patch new file +1859 -0
1,859 lines not on this page · raw message
meta/recipes-bsp/grub/files/0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch new file +94 -0
94 lines not on this page · raw message
meta/recipes-bsp/grub/files/0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch new file +1326 -0
514 lines not on this page · raw message
meta/recipes-bsp/grub/files/0006-script-Remove-unused-fields-from-grub_script_functio.patch new file +37 -0
Lines of this file are not shown. View the raw message.
meta/recipes-bsp/grub/files/0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch new file +113 -0
113 lines not on this page · raw message
meta/recipes-bsp/grub/files/0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch new file +173 -0
173 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
PATCH 12/12 grub: clean up CVE patches
In reply to Steve SakomanFrom: Yongxin Liu <[email protected]>
Clean up several patches introduced in commit 6732918498 ("grub:fix several CVEs in grub 2.04").
1) Add CVE tags to individual patches.
2) Rename upstream patches and prefix them with CVE tags.
3) Add description of reference to upstream patch.
---
...14308-calloc-Use-calloc-at-most-places.patch} | 10 +++++++---
...rflow-checking-primitives-where-we-do-.patch} | 10 +++++++---
...-use-after-free-when-redefining-a-func.patch} | 10 +++++++---
...eger-overflows-in-initrd-size-handling.patch} | 10 +++++++---
...re-we-always-have-an-overflow-checking.patch} | 0
...-Add-LVM-cache-logical-volume-handling.patch} | 0
...ome-arithmetic-primitives-that-check-f.patch} | 0
...unused-fields-from-grub_script_functio.patch} | 0
meta/recipes-bsp/grub/grub2.inc | 16 ++++++++--------
9 files changed, 36 insertions(+), 20 deletions(-)
rename meta/recipes-bsp/grub/files/{0003-calloc-Use-calloc-at-most-places.patch => CVE-2020-14308-calloc-Use-calloc-at-most-places.patch} (99%)
rename meta/recipes-bsp/grub/files/{0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch => CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch} (99%)
rename meta/recipes-bsp/grub/files/{0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch => CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch} (95%)
rename meta/recipes-bsp/grub/files/{0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch => CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch} (96%)
rename meta/recipes-bsp/grub/files/{0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch => calloc-Make-sure-we-always-have-an-overflow-checking.patch} (100%)
rename meta/recipes-bsp/grub/files/{0002-lvm-Add-LVM-cache-logical-volume-handling.patch => lvm-Add-LVM-cache-logical-volume-handling.patch} (100%)
rename meta/recipes-bsp/grub/files/{0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch => safemath-Add-some-arithmetic-primitives-that-check-f.patch} (100%)
rename meta/recipes-bsp/grub/files/{0006-script-Remove-unused-fields-from-grub_script_functio.patch => script-Remove-unused-fields-from-grub_script_functio.patch} (100%)meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-Use-calloc-at-most-places.patch renamed from meta/recipes-bsp/grub/files/0003-calloc-Use-calloc-at-most-places.patch +7 -3
@@ -19,11 +19,15 @@ Among other issues, this fixes: Fixes: CVE-2020-14308 -Upstream-Status: Backport [commit f725fa7cb2ece547c5af01eeeecfe8d95802ed41 -from https://git.savannah.gnu.org/git/grub.git] - Signed-off-by: Peter Jones <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> + +Upstream-Status: Backport +CVE: CVE-2020-14308 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=f725fa7cb2ece547c5af01eeeecfe8d95802ed41 + [YL: don't patch on grub-core/lib/json/json.c, which is not existing in grub 2.04] Signed-off-by: Yongxin Liu <[email protected]> ---
meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch renamed from meta/recipes-bsp/grub/files/0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch +7 -3
@@ -26,11 +26,15 @@ Among other issues, this fixes: Fixes: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 -Upstream-Status: Backport [commit 3f05d693d1274965ffbe4ba99080dc2c570944c6 -from https://git.savannah.gnu.org/git/grub.git] - Signed-off-by: Peter Jones <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> + +Upstream-Status: Backport +CVE: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6 + Signed-off-by: Yongxin Liu <[email protected]> --- grub-core/commands/legacycfg.c | 29 +++++++++++++++++++-----
meta/recipes-bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch renamed from meta/recipes-bsp/grub/files/0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch +7 -3
@@ -19,11 +19,15 @@ dependent on the current behaviour without being broken. Fixes: CVE-2020-15706 -Upstream-Status: Backport [commit 426f57383d647406ae9c628c472059c27cd6e040 -from https://git.savannah.gnu.org/git/grub.git] - Signed-off-by: Chris Coulson <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> + +Upstream-Status: Backport +CVE: CVE-2020-15706 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=426f57383d647406ae9c628c472059c27cd6e040 + Signed-off-by: Yongxin Liu <[email protected]> --- grub-core/script/execute.c | 2 ++
meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch renamed from meta/recipes-bsp/grub/files/0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch +7 -3
@@ -7,12 +7,16 @@ These could be triggered by a crafted filesystem with very large files. Fixes: CVE-2020-15707 -Upstream-Status: Backport [commit e7b8856f8be3292afdb38d2e8c70ad8d62a61e10 -from https://git.savannah.gnu.org/git/grub.git] - Signed-off-by: Colin Watson <[email protected]> Reviewed-by: Jan Setje-Eilers <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> + +Upstream-Status: Backport +CVE: CVE-2020-15707 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=e7b8856f8be3292afdb38d2e8c70ad8d62a61e10 + Signed-off-by: Yongxin Liu <[email protected]> --- grub-core/loader/linux.c | 74 +++++++++++++++++++++++++++++++++++-------------
meta/recipes-bsp/grub/files/calloc-Make-sure-we-always-have-an-overflow-checking.patch renamed from meta/recipes-bsp/grub/files/0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch +0 -0
meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical-volume-handling.patch renamed from meta/recipes-bsp/grub/files/0002-lvm-Add-LVM-cache-logical-volume-handling.patch +0 -0
meta/recipes-bsp/grub/files/safemath-Add-some-arithmetic-primitives-that-check-f.patch renamed from meta/recipes-bsp/grub/files/0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch +0 -0
meta/recipes-bsp/grub/files/script-Remove-unused-fields-from-grub_script_functio.patch renamed from meta/recipes-bsp/grub/files/0006-script-Remove-unused-fields-from-grub_script_functio.patch +0 -0
meta/recipes-bsp/grub/grub2.inc +8 -8
@@ -19,14 +19,14 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://grub-module-explicitly-keeps-symbole-.module_license.patch \ file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ file://CVE-2020-10713.patch \ - file://0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch \ - file://0002-lvm-Add-LVM-cache-logical-volume-handling.patch \ - file://0003-calloc-Use-calloc-at-most-places.patch \ - file://0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch \ - file://0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch \ - file://0006-script-Remove-unused-fields-from-grub_script_functio.patch \ - file://0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ - file://0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ + file://calloc-Make-sure-we-always-have-an-overflow-checking.patch \ + file://lvm-Add-LVM-cache-logical-volume-handling.patch \ + file://CVE-2020-14308-calloc-Use-calloc-at-most-places.patch \ + file://safemath-Add-some-arithmetic-primitives-that-check-f.patch \ + file://CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch \ + file://script-Remove-unused-fields-from-grub_script_functio.patch \ + file://CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ + file://CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea"
Signature · 1 line
2.17.1