* [hardknott][PATCH 00/64] review request
@ 2021-04-26 0:49 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 01/64] lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9) Anuj Mittal
` (63 more replies)
0 siblings, 64 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:49 UTC (permalink / raw)
To: openembedded-core
Please review these changes for hardknott. Testing on autobuilder shows
a few issues but they are all known, unrelated problems (one oe-selftest
failed because of bitbake timeout and qemuppc builds failed because of
timeout while shutting down qemu).
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2069
Thanks,
Anuj
The following changes since commit 08b2c9a23ce43ed65a16f5f0714b19a571e1b54a:
oeqa/selftest: Hardcode test assumptions about heartbeat event timings (2021-04-16 13:35:54 +0100)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib stable/hardknott-next
Alejandro Enedino Hernandez Samaniego (2):
python3: Upgrade 3.9.2 -> 3.9.4
python3: Improve logging, syntax and update deprecated modules to
create_manifest
Alexander Kanavin (1):
scripts/oe-debuginfod: correct several issues
Anders Wallin (2):
lttng-tools: Fix missing legacy test files
lttng-tools: Fix path for test_python_looging
Anthony Bagwell (1):
systemd: upgrade 247.4 -> 247.6
Bruce Ashfield (10):
linux-yocto/5.4: update to v5.4.109
linux-yocto/5.10: update to v5.10.27
linux-yocto/5.10: BSP configuration fixes
linux-yocto/5.10: update to v5.10.29
linux-yocto/5.4: update to v5.4.111
linux-yocto/5.10: update to v5.10.30
linux-yocto-rt/5.10: update to -rt34
linux-yocto/5.4: update to v5.4.112
linux-yocto/5.4: fix arm defconfig warnings
linux-yocto/5.10: fix arm defconfig warnings
Changqing Li (2):
cairo: fix CVE-2020-35492
gdk-pixbuf: fix CVE-2021-20240
Chen Qi (1):
busybox: fix CVE-2021-28831
Daniel Ammann (1):
archiver: Fix typos
Douglas Royds (2):
Revert "externalsrc: Detect code changes in submodules"
externalsrc: Detect code changes in submodules
Gavin Li (1):
kmod: do not symlink config.guess/config.sub during autoreconf
He Zhe (1):
linux-yocto-dev: add features/scsi/scsi-debug.scc
features/gpio/mockup.scc to KERNEL_FEATURES
Jon Mason (1):
oeqa/runtime: space needed
Jonas Höppner (1):
ltp: fix empty ltp-dev package
Kevin Hao (3):
modutils-initscripts: Bail out when no module is installed
sysvinit-inittab/start_getty: Check /sys for the tty device existence
Revert "inittab: Add getty launch on hvc0 for qemuppc64"
Khairul Rohaizzat Jamaluddin (1):
qemu: Fix CVE-2020-35517
Khem Raj (3):
ca-certificates: Fix openssl runtime cert dependencies
systemd: Fix build on mips/musl
go: Use dl.google.com for SRC_URI
Konrad Weihmann (1):
cve-update-db-native: skip on empty cpe23Uri
Mingli Yu (6):
groff: not ship /usr/bin/grap2graph
libtool: make sure autoheader run before automake
packagegroup-core-tools-profile: Remove valgrind for riscv32
packagegroup-core-tools-testapps.bb: Remove kexec for riscv32
libxshmfence: Build fixes for riscv32
rpm: Upgrade to 4.16.1.3
Peter Budny (1):
lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9)
Randy MacLeod (1):
oe-time-dd-test.sh: increase timeout to 15 sec
Richard Purdie (4):
pseudo: Upgrade to add trailing slashes ignore path fix
oeqa/selftest: Ensure packages classes are set correctly for
maintainers test
sanity: Add error check for '%' in build path
runqemu: Ensure we cleanup snapshot files after image run
Ross Burton (2):
insane: clean up some more warning messages
glslang: strip whitespace in pkgconfig file
Sakib Sajal (6):
qemu: fix CVE-2021-20181
qemu: fix CVE-2020-29443
qemu: fix CVE-2021-20221
qemu: fix CVE-2021-3409
qemu: fix CVE-2021-3416
qemu: fix CVE-2021-20257
Saul Wold (1):
pango: re-enable ptest
Stefan Ghinea (1):
wpa-supplicant: fix CVE-2021-30004
Trevor Gamblin (1):
nettle: upgrade 3.7.1 -> 3.7.2
Ulrich Ölmann (1):
arch-armv6m.inc: fix access rights
Wes Lindauer (1):
oeqa/runtime/cases: Only disable/enable for current boot
Yanfei Xu (1):
parselogs: ignore floppy error on qemu-system-x86 at boot stage
hongxu (1):
deb: apply postinstall on sdk
wangmy (3):
mesa: upgrade 21.0.1 -> 21.0.2
go: update SRC_URI to use https protocol
go: upgrade 1.16.2 -> 1.16.3
meta/classes/archiver.bbclass | 8 +-
meta/classes/externalsrc.bbclass | 7 +-
meta/classes/insane.bbclass | 12 +-
meta/classes/sanity.bbclass | 2 +
meta/conf/machine/include/arm/arch-armv6m.inc | 0
meta/lib/oe/package_manager/deb/sdk.py | 4 +
meta/lib/oe/terminal.py | 16 +-
meta/lib/oeqa/runtime/cases/date.py | 4 +-
meta/lib/oeqa/runtime/cases/parselogs.py | 2 +
meta/lib/oeqa/runtime/cases/rtc.py | 4 +-
meta/lib/oeqa/runtime/decorator/package.py | 4 +-
meta/lib/oeqa/selftest/cases/distrodata.py | 2 +-
.../wpa-supplicant/CVE-2021-30004.patch | 123 +++++++
.../wpa-supplicant/wpa-supplicant_2.9.bb | 1 +
.../busybox/busybox-inittab_1.33.0.bb | 3 -
...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 58 ++++
meta/recipes-core/busybox/busybox_1.33.0.bb | 3 +-
.../recipes-core/meta/cve-update-db-native.bb | 7 +-
.../packagegroup-core-tools-profile.bb | 1 +
.../packagegroup-core-tools-testapps.bb | 1 +
...md-boot_247.4.bb => systemd-boot_247.6.bb} | 0
...md-conf_247.3.bb => systemd-conf_247.6.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
...l.h-Define-MIPS-ABI-defines-for-musl.patch | 36 +++
.../{systemd_247.4.bb => systemd_247.6.bb} | 1 +
.../sysvinit/sysvinit-inittab/start_getty | 44 +--
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 4 -
.../go/{go-1.16.2.inc => go-1.16.3.inc} | 4 +-
...e_1.16.2.bb => go-binary-native_1.16.3.bb} | 4 +-
meta/recipes-devtools/go/go-common.inc | 2 +-
..._1.16.2.bb => go-cross-canadian_1.16.3.bb} | 0
...{go-cross_1.16.2.bb => go-cross_1.16.3.bb} | 0
...osssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} | 0
...o-native_1.16.2.bb => go-native_1.16.3.bb} | 0
...runtime_1.16.2.bb => go-runtime_1.16.3.bb} | 0
.../go/{go_1.16.2.bb => go_1.16.3.bb} | 0
.../libtool/libtool-2.4.6.inc | 1 +
...-sure-autoheader-run-before-automake.patch | 35 ++
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
...le.py-correct-the-test-output-format.patch | 22 +-
.../python/python3/create_manifest3.py | 47 +--
.../python/python3/get_module_deps3.py | 72 +++--
.../{python3_3.9.2.bb => python3_3.9.4.bb} | 4 +-
meta/recipes-devtools/qemu/qemu.inc | 23 ++
.../qemu/qemu/CVE-2020-29443.patch | 107 +++++++
.../qemu/qemu/CVE-2020-35517_1.patch | 153 +++++++++
.../qemu/qemu/CVE-2020-35517_2.patch | 117 +++++++
.../qemu/qemu/CVE-2020-35517_3.patch | 303 ++++++++++++++++++
.../qemu/qemu/CVE-2021-20181.patch | 81 +++++
.../qemu/qemu/CVE-2021-20221.patch | 70 ++++
.../qemu/qemu/CVE-2021-20257.patch | 55 ++++
.../qemu/qemu/CVE-2021-3409_1.patch | 56 ++++
.../qemu/qemu/CVE-2021-3409_2.patch | 92 ++++++
.../qemu/qemu/CVE-2021-3409_3.patch | 109 +++++++
.../qemu/qemu/CVE-2021-3409_4.patch | 75 +++++
.../qemu/qemu/CVE-2021-3409_5.patch | 56 ++++
.../qemu/qemu/CVE-2021-3409_6.patch | 99 ++++++
.../qemu/qemu/CVE-2021-3416_1.patch | 177 ++++++++++
.../qemu/qemu/CVE-2021-3416_10.patch | 44 +++
.../qemu/qemu/CVE-2021-3416_2.patch | 42 +++
.../qemu/qemu/CVE-2021-3416_3.patch | 43 +++
.../qemu/qemu/CVE-2021-3416_4.patch | 43 +++
.../qemu/qemu/CVE-2021-3416_5.patch | 45 +++
.../qemu/qemu/CVE-2021-3416_6.patch | 43 +++
.../qemu/qemu/CVE-2021-3416_7.patch | 45 +++
.../qemu/qemu/CVE-2021-3416_8.patch | 44 +++
.../qemu/qemu/CVE-2021-3416_9.patch | 46 +++
...lib-rpm-as-the-installation-path-for.patch | 8 +-
.../rpm/{rpm_4.16.1.2.bb => rpm_4.16.1.3.bb} | 2 +-
meta/recipes-extended/groff/groff_1.22.4.bb | 4 +
meta/recipes-extended/ltp/ltp_20210121.bb | 2 +-
.../gdk-pixbuf/CVE-2021-20240.patch | 40 +++
.../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 +
.../cairo/cairo/CVE-2020-35492.patch | 121 +++++++
.../cairo/cairo/bug-image-compositor.ref.png | Bin 0 -> 185 bytes
meta/recipes-graphics/cairo/cairo_1.16.0.bb | 11 +
.../0001-generate-glslang-pkg-config.patch | 22 +-
.../{mesa-gl_21.0.1.bb => mesa-gl_21.0.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
.../mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} | 0
meta/recipes-graphics/pango/pango_1.48.2.bb | 2 +
...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++
.../xorg-lib/libxshmfence_1.3.bb | 4 +-
meta/recipes-kernel/kmod/kmod.inc | 1 -
meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +
.../linux/linux-yocto-rt_5.10.bb | 6 +-
.../linux/linux-yocto-rt_5.4.bb | 6 +-
.../linux/linux-yocto-tiny_5.10.bb | 8 +-
.../linux/linux-yocto-tiny_5.4.bb | 8 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +-
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +-
.../lttng/lttng-tools_2.12.3.bb | 4 +-
.../modutils-initscripts/files/modutils.sh | 1 +
.../ca-certificates_20210119.bb | 6 +-
.../{nettle_3.7.1.bb => nettle_3.7.2.bb} | 2 +-
scripts/oe-debuginfod | 13 +-
scripts/oe-time-dd-test.sh | 2 +-
scripts/runqemu | 18 +-
98 files changed, 2670 insertions(+), 221 deletions(-)
mode change 100755 => 100644 meta/conf/machine/include/arm/arch-armv6m.inc
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
create mode 100644 meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
rename meta/recipes-core/systemd/{systemd-boot_247.4.bb => systemd-boot_247.6.bb} (100%)
rename meta/recipes-core/systemd/{systemd-conf_247.3.bb => systemd-conf_247.6.bb} (100%)
create mode 100644 meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
rename meta/recipes-core/systemd/{systemd_247.4.bb => systemd_247.6.bb} (99%)
rename meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} (88%)
rename meta/recipes-devtools/go/{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.16.2.bb => go-native_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} (100%)
create mode 100644 meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch
rename meta/recipes-devtools/python/{python3_3.9.2.bb => python3_3.9.4.bb} (99%)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-29443.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20181.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20221.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20257.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_5.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_6.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_10.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_4.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_5.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_6.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_8.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_9.patch
rename meta/recipes-devtools/rpm/{rpm_4.16.1.2.bb => rpm_4.16.1.3.bb} (99%)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
create mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
create mode 100644 meta/recipes-graphics/cairo/cairo/bug-image-compositor.ref.png
rename meta/recipes-graphics/mesa/{mesa-gl_21.0.1.bb => mesa-gl_21.0.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} (100%)
create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch
rename meta/recipes-support/nettle/{nettle_3.7.1.bb => nettle_3.7.2.bb} (96%)
--
2.30.2
^ permalink raw reply [flat|nested] 65+ messages in thread
* [hardknott][PATCH 01/64] lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9)
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 02/64] pseudo: Upgrade to add trailing slashes ignore path fix Anuj Mittal
` (62 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Peter Budny <pbbudny@amazon.com>
`tmux new -c` fails on tmux older than 1.9, when that flag was added.
We can omit the flag for older versions of tmux, and the working
directory gets set even without it.
Signed-off-by: Peter Budny <pbbudny@amazon.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c55c294be6f5119f4c58a4e7a0bc052904126569)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oe/terminal.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 61c2687ef4..59aa80de66 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -163,7 +163,12 @@ class Tmux(Terminal):
# devshells, if it's already there, add a new window to it.
window_name = 'devshell-%i' % os.getpid()
- self.command = 'tmux new -c "{{cwd}}" -d -s {0} -n {0} "{{command}}"'.format(window_name)
+ self.command = 'tmux new -c "{{cwd}}" -d -s {0} -n {0} "{{command}}"'
+ if not check_tmux_version('1.9'):
+ # `tmux new-session -c` was added in 1.9;
+ # older versions fail with that flag
+ self.command = 'tmux new -d -s {0} -n {0} "{{command}}"'
+ self.command = self.command.format(window_name)
Terminal.__init__(self, sh_cmd, title, env, d)
attach_cmd = 'tmux att -t {0}'.format(window_name)
@@ -253,13 +258,18 @@ def spawn(name, sh_cmd, title=None, env=None, d=None):
except OSError:
return
+def check_tmux_version(desired):
+ vernum = check_terminal_version("tmux")
+ if vernum and LooseVersion(vernum) < desired:
+ return False
+ return vernum
+
def check_tmux_pane_size(tmux):
import subprocess as sub
# On older tmux versions (<1.9), return false. The reason
# is that there is no easy way to get the height of the active panel
# on current window without nested formats (available from version 1.9)
- vernum = check_terminal_version("tmux")
- if vernum and LooseVersion(vernum) < '1.9':
+ if not check_tmux_version('1.9'):
return False
try:
p = sub.Popen('%s list-panes -F "#{?pane_active,#{pane_height},}"' % tmux,
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 02/64] pseudo: Upgrade to add trailing slashes ignore path fix
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 01/64] lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9) Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 03/64] oeqa/selftest: Ensure packages classes are set correctly for maintainers test Anuj Mittal
` (61 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Pull in:
client: strip trailing slashes when opening an ignored path
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9fb92bc13b8a78ef98798f14e728058feb180ba6)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 17bd02c27c..4eab133128 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -6,7 +6,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
file://fallback-group \
"
-SRCREV = "60e25a36558f1f07dcce1a044fe976b475bec42b"
+SRCREV = "ee24ebec9e5a11dd5208c9be2870f35eab3b9e20"
S = "${WORKDIR}/git"
PV = "1.9.0+git${SRCPV}"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 03/64] oeqa/selftest: Ensure packages classes are set correctly for maintainers test
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 01/64] lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9) Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 02/64] pseudo: Upgrade to add trailing slashes ignore path fix Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 04/64] qemu: Fix CVE-2020-35517 Anuj Mittal
` (60 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The dnf packages aren't parsed if rpm isn't in PACKAGE_CLASSES which means
the aintainers test failes for OE-Core (where ipk is the default) but not
for poky (where the default is rpm).
Ensure PACKAGE_CLASSES is set so it works in all cases.
[YOCTO #14277]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 842b11107363357ed933cfcf619f1cf23f0d841e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oeqa/selftest/cases/distrodata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index fbc0c2a98d..0ad6e1ef91 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -99,7 +99,7 @@ The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIP
return True
return False
- feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\nPARSE_ALL_RECIPES = "1"\n'
+ feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n'
self.write_config(feature)
with bb.tinfoil.Tinfoil() as tinfoil:
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 04/64] qemu: Fix CVE-2020-35517
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (2 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 03/64] oeqa/selftest: Ensure packages classes are set correctly for maintainers test Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 05/64] archiver: Fix typos Anuj Mittal
` (59 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
CVE:
CVE-2020-35517
Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51376edb13eed748395ebe1e56081c092565be9b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 3 +
.../qemu/qemu/CVE-2020-35517_1.patch | 153 +++++++++
.../qemu/qemu/CVE-2020-35517_2.patch | 117 +++++++
.../qemu/qemu/CVE-2020-35517_3.patch | 303 ++++++++++++++++++
4 files changed, 576 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-35517_3.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index a625809597..f0416b0379 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -31,6 +31,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://determinism.patch \
file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \
file://CVE-2021-20203.patch \
+ file://CVE-2020-35517_1.patch \
+ file://CVE-2020-35517_2.patch \
+ file://CVE-2020-35517_3.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_1.patch
new file mode 100644
index 0000000000..73a4cb2064
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_1.patch
@@ -0,0 +1,153 @@
+From 8afaaee976965b7fb90ec225a51d60f35c5f173c Mon Sep 17 00:00:00 2001
+From: Stefan Hajnoczi <stefanha@redhat.com>
+Date: Thu, 4 Feb 2021 15:02:06 +0000
+Subject: [PATCH] virtiofsd: extract lo_do_open() from lo_open()
+
+Both lo_open() and lo_create() have similar code to open a file. Extract
+a common lo_do_open() function from lo_open() that will be used by
+lo_create() in a later commit.
+
+Since lo_do_open() does not otherwise need fuse_req_t req, convert
+lo_add_fd_mapping() to use struct lo_data *lo instead.
+
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-Id: <20210204150208.367837-2-stefanha@redhat.com>
+Reviewed-by: Greg Kurz <groug@kaod.org>
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+
+Upstream-Status: Backport
+[https://github.com/qemu/qemu/commit/8afaaee976965b7fb90ec225a51d60f35c5f173c]
+
+CVE: CVE-2020-35517
+
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
+---
+ tools/virtiofsd/passthrough_ll.c | 73 +++++++++++++++++++++++++---------------
+ 1 file changed, 46 insertions(+), 27 deletions(-)
+
+diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
+index 5fb36d9..f14fa51 100644
+--- a/tools/virtiofsd/passthrough_ll.c
++++ b/tools/virtiofsd/passthrough_ll.c
+@@ -459,17 +459,17 @@ static void lo_map_remove(struct lo_map *map, size_t key)
+ }
+
+ /* Assumes lo->mutex is held */
+-static ssize_t lo_add_fd_mapping(fuse_req_t req, int fd)
++static ssize_t lo_add_fd_mapping(struct lo_data *lo, int fd)
+ {
+ struct lo_map_elem *elem;
+
+- elem = lo_map_alloc_elem(&lo_data(req)->fd_map);
++ elem = lo_map_alloc_elem(&lo->fd_map);
+ if (!elem) {
+ return -1;
+ }
+
+ elem->fd = fd;
+- return elem - lo_data(req)->fd_map.elems;
++ return elem - lo->fd_map.elems;
+ }
+
+ /* Assumes lo->mutex is held */
+@@ -1651,6 +1651,38 @@ static void update_open_flags(int writeback, int allow_direct_io,
+ }
+ }
+
++static int lo_do_open(struct lo_data *lo, struct lo_inode *inode,
++ struct fuse_file_info *fi)
++{
++ char buf[64];
++ ssize_t fh;
++ int fd;
++
++ update_open_flags(lo->writeback, lo->allow_direct_io, fi);
++
++ sprintf(buf, "%i", inode->fd);
++ fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
++ if (fd == -1) {
++ return errno;
++ }
++
++ pthread_mutex_lock(&lo->mutex);
++ fh = lo_add_fd_mapping(lo, fd);
++ pthread_mutex_unlock(&lo->mutex);
++ if (fh == -1) {
++ close(fd);
++ return ENOMEM;
++ }
++
++ fi->fh = fh;
++ if (lo->cache == CACHE_NONE) {
++ fi->direct_io = 1;
++ } else if (lo->cache == CACHE_ALWAYS) {
++ fi->keep_cache = 1;
++ }
++ return 0;
++}
++
+ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
+ mode_t mode, struct fuse_file_info *fi)
+ {
+@@ -1691,7 +1723,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
+ ssize_t fh;
+
+ pthread_mutex_lock(&lo->mutex);
+- fh = lo_add_fd_mapping(req, fd);
++ fh = lo_add_fd_mapping(lo, fd);
+ pthread_mutex_unlock(&lo->mutex);
+ if (fh == -1) {
+ close(fd);
+@@ -1892,38 +1924,25 @@ static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync,
+
+ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
+ {
+- int fd;
+- ssize_t fh;
+- char buf[64];
+ struct lo_data *lo = lo_data(req);
++ struct lo_inode *inode = lo_inode(req, ino);
++ int err;
+
+ fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=%" PRIu64 ", flags=%d)\n", ino,
+ fi->flags);
+
+- update_open_flags(lo->writeback, lo->allow_direct_io, fi);
+-
+- sprintf(buf, "%i", lo_fd(req, ino));
+- fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
+- if (fd == -1) {
+- return (void)fuse_reply_err(req, errno);
+- }
+-
+- pthread_mutex_lock(&lo->mutex);
+- fh = lo_add_fd_mapping(req, fd);
+- pthread_mutex_unlock(&lo->mutex);
+- if (fh == -1) {
+- close(fd);
+- fuse_reply_err(req, ENOMEM);
++ if (!inode) {
++ fuse_reply_err(req, EBADF);
+ return;
+ }
+
+- fi->fh = fh;
+- if (lo->cache == CACHE_NONE) {
+- fi->direct_io = 1;
+- } else if (lo->cache == CACHE_ALWAYS) {
+- fi->keep_cache = 1;
++ err = lo_do_open(lo, inode, fi);
++ lo_inode_put(lo, &inode);
++ if (err) {
++ fuse_reply_err(req, err);
++ } else {
++ fuse_reply_open(req, fi);
+ }
+- fuse_reply_open(req, fi);
+ }
+
+ static void lo_release(fuse_req_t req, fuse_ino_t ino,
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_2.patch
new file mode 100644
index 0000000000..bf11bdb6f8
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_2.patch
@@ -0,0 +1,117 @@
+From 22d2ece71e533310da31f2857ebc4a00d91968b3 Mon Sep 17 00:00:00 2001
+From: Stefan Hajnoczi <stefanha@redhat.com>
+Date: Thu, 4 Feb 2021 15:02:07 +0000
+Subject: [PATCH] virtiofsd: optionally return inode pointer from
+ lo_do_lookup()
+
+lo_do_lookup() finds an existing inode or allocates a new one. It
+increments nlookup so that the inode stays alive until the client
+releases it.
+
+Existing callers don't need the struct lo_inode so the function doesn't
+return it. Extend the function to optionally return the inode. The next
+commit will need it.
+
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Greg Kurz <groug@kaod.org>
+Message-Id: <20210204150208.367837-3-stefanha@redhat.com>
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+
+Upstream-Status: Backport
+[https://github.com/qemu/qemu/commit/22d2ece71e533310da31f2857ebc4a00d91968b3]
+
+CVE: CVE-2020-35517
+
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
+---
+ tools/virtiofsd/passthrough_ll.c | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
+index f14fa51..aa35fc6 100644
+--- a/tools/virtiofsd/passthrough_ll.c
++++ b/tools/virtiofsd/passthrough_ll.c
+@@ -831,11 +831,13 @@ static int do_statx(struct lo_data *lo, int dirfd, const char *pathname,
+ }
+
+ /*
+- * Increments nlookup and caller must release refcount using
+- * lo_inode_put(&parent).
++ * Increments nlookup on the inode on success. unref_inode_lolocked() must be
++ * called eventually to decrement nlookup again. If inodep is non-NULL, the
++ * inode pointer is stored and the caller must call lo_inode_put().
+ */
+ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
+- struct fuse_entry_param *e)
++ struct fuse_entry_param *e,
++ struct lo_inode **inodep)
+ {
+ int newfd;
+ int res;
+@@ -845,6 +847,10 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
+ struct lo_inode *inode = NULL;
+ struct lo_inode *dir = lo_inode(req, parent);
+
++ if (inodep) {
++ *inodep = NULL;
++ }
++
+ /*
+ * name_to_handle_at() and open_by_handle_at() can reach here with fuse
+ * mount point in guest, but we don't have its inode info in the
+@@ -913,7 +919,14 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
+ pthread_mutex_unlock(&lo->mutex);
+ }
+ e->ino = inode->fuse_ino;
+- lo_inode_put(lo, &inode);
++
++ /* Transfer ownership of inode pointer to caller or drop it */
++ if (inodep) {
++ *inodep = inode;
++ } else {
++ lo_inode_put(lo, &inode);
++ }
++
+ lo_inode_put(lo, &dir);
+
+ fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", (unsigned long long)parent,
+@@ -948,7 +961,7 @@ static void lo_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
+ return;
+ }
+
+- err = lo_do_lookup(req, parent, name, &e);
++ err = lo_do_lookup(req, parent, name, &e, NULL);
+ if (err) {
+ fuse_reply_err(req, err);
+ } else {
+@@ -1056,7 +1069,7 @@ static void lo_mknod_symlink(fuse_req_t req, fuse_ino_t parent,
+ goto out;
+ }
+
+- saverr = lo_do_lookup(req, parent, name, &e);
++ saverr = lo_do_lookup(req, parent, name, &e, NULL);
+ if (saverr) {
+ goto out;
+ }
+@@ -1534,7 +1547,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
+
+ if (plus) {
+ if (!is_dot_or_dotdot(name)) {
+- err = lo_do_lookup(req, ino, name, &e);
++ err = lo_do_lookup(req, ino, name, &e, NULL);
+ if (err) {
+ goto error;
+ }
+@@ -1732,7 +1745,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
+ }
+
+ fi->fh = fh;
+- err = lo_do_lookup(req, parent, name, &e);
++ err = lo_do_lookup(req, parent, name, &e, NULL);
+ }
+ if (lo->cache == CACHE_NONE) {
+ fi->direct_io = 1;
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_3.patch
new file mode 100644
index 0000000000..f348f3f2bd
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-35517_3.patch
@@ -0,0 +1,303 @@
+From a3fdbbc7f271bff7d53d0501b29d910ece0b3789 Mon Sep 17 00:00:00 2001
+From: Stefan Hajnoczi <stefanha@redhat.com>
+Date: Thu, 4 Feb 2021 15:02:08 +0000
+Subject: [PATCH] virtiofsd: prevent opening of special files (CVE-2020-35517)
+
+A well-behaved FUSE client does not attempt to open special files with
+FUSE_OPEN because they are handled on the client side (e.g. device nodes
+are handled by client-side device drivers).
+
+The check to prevent virtiofsd from opening special files is missing in
+a few cases, most notably FUSE_OPEN. A malicious client can cause
+virtiofsd to open a device node, potentially allowing the guest to
+escape. This can be exploited by a modified guest device driver. It is
+not exploitable from guest userspace since the guest kernel will handle
+special files inside the guest instead of sending FUSE requests.
+
+This patch fixes this issue by introducing the lo_inode_open() function
+to check the file type before opening it. This is a short-term solution
+because it does not prevent a compromised virtiofsd process from opening
+device nodes on the host.
+
+Restructure lo_create() to try O_CREAT | O_EXCL first. Note that O_CREAT
+| O_EXCL does not follow symlinks, so O_NOFOLLOW masking is not
+necessary here. If the file exists and the user did not specify O_EXCL,
+open it via lo_do_open().
+
+Reported-by: Alex Xu <alex@alxu.ca>
+Fixes: CVE-2020-35517
+Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Reviewed-by: Vivek Goyal <vgoyal@redhat.com>
+Reviewed-by: Greg Kurz <groug@kaod.org>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-Id: <20210204150208.367837-4-stefanha@redhat.com>
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+
+Upstream-Status: Backport
+[https://github.com/qemu/qemu/commit/a3fdbbc7f271bff7d53d0501b29d910ece0b3789]
+
+CVE: CVE-2020-35517
+
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
+---
+ tools/virtiofsd/passthrough_ll.c | 144 ++++++++++++++++++++-----------
+ 1 file changed, 92 insertions(+), 52 deletions(-)
+
+diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
+index aa35fc6ba5a5..147b59338a18 100644
+--- a/tools/virtiofsd/passthrough_ll.c
++++ b/tools/virtiofsd/passthrough_ll.c
+@@ -555,6 +555,38 @@ static int lo_fd(fuse_req_t req, fuse_ino_t ino)
+ return fd;
+ }
+
++/*
++ * Open a file descriptor for an inode. Returns -EBADF if the inode is not a
++ * regular file or a directory.
++ *
++ * Use this helper function instead of raw openat(2) to prevent security issues
++ * when a malicious client opens special files such as block device nodes.
++ * Symlink inodes are also rejected since symlinks must already have been
++ * traversed on the client side.
++ */
++static int lo_inode_open(struct lo_data *lo, struct lo_inode *inode,
++ int open_flags)
++{
++ g_autofree char *fd_str = g_strdup_printf("%d", inode->fd);
++ int fd;
++
++ if (!S_ISREG(inode->filetype) && !S_ISDIR(inode->filetype)) {
++ return -EBADF;
++ }
++
++ /*
++ * The file is a symlink so O_NOFOLLOW must be ignored. We checked earlier
++ * that the inode is not a special file but if an external process races
++ * with us then symlinks are traversed here. It is not possible to escape
++ * the shared directory since it is mounted as "/" though.
++ */
++ fd = openat(lo->proc_self_fd, fd_str, open_flags & ~O_NOFOLLOW);
++ if (fd < 0) {
++ return -errno;
++ }
++ return fd;
++}
++
+ static void lo_init(void *userdata, struct fuse_conn_info *conn)
+ {
+ struct lo_data *lo = (struct lo_data *)userdata;
+@@ -684,9 +716,9 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
+ if (fi) {
+ truncfd = fd;
+ } else {
+- sprintf(procname, "%i", ifd);
+- truncfd = openat(lo->proc_self_fd, procname, O_RDWR);
++ truncfd = lo_inode_open(lo, inode, O_RDWR);
+ if (truncfd < 0) {
++ errno = -truncfd;
+ goto out_err;
+ }
+ }
+@@ -848,7 +880,7 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
+ struct lo_inode *dir = lo_inode(req, parent);
+
+ if (inodep) {
+- *inodep = NULL;
++ *inodep = NULL; /* in case there is an error */
+ }
+
+ /*
+@@ -1664,19 +1696,26 @@ static void update_open_flags(int writeback, int allow_direct_io,
+ }
+ }
+
++/*
++ * Open a regular file, set up an fd mapping, and fill out the struct
++ * fuse_file_info for it. If existing_fd is not negative, use that fd instead
++ * opening a new one. Takes ownership of existing_fd.
++ *
++ * Returns 0 on success or a positive errno.
++ */
+ static int lo_do_open(struct lo_data *lo, struct lo_inode *inode,
+- struct fuse_file_info *fi)
++ int existing_fd, struct fuse_file_info *fi)
+ {
+- char buf[64];
+ ssize_t fh;
+- int fd;
++ int fd = existing_fd;
+
+ update_open_flags(lo->writeback, lo->allow_direct_io, fi);
+
+- sprintf(buf, "%i", inode->fd);
+- fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
+- if (fd == -1) {
+- return errno;
++ if (fd < 0) {
++ fd = lo_inode_open(lo, inode, fi->flags);
++ if (fd < 0) {
++ return -fd;
++ }
+ }
+
+ pthread_mutex_lock(&lo->mutex);
+@@ -1699,9 +1738,10 @@ static int lo_do_open(struct lo_data *lo, struct lo_inode *inode,
+ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
+ mode_t mode, struct fuse_file_info *fi)
+ {
+- int fd;
++ int fd = -1;
+ struct lo_data *lo = lo_data(req);
+ struct lo_inode *parent_inode;
++ struct lo_inode *inode = NULL;
+ struct fuse_entry_param e;
+ int err;
+ struct lo_cred old = {};
+@@ -1727,36 +1767,38 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
+
+ update_open_flags(lo->writeback, lo->allow_direct_io, fi);
+
+- fd = openat(parent_inode->fd, name, (fi->flags | O_CREAT) & ~O_NOFOLLOW,
+- mode);
++ /* Try to create a new file but don't open existing files */
++ fd = openat(parent_inode->fd, name, fi->flags | O_CREAT | O_EXCL, mode);
+ err = fd == -1 ? errno : 0;
+- lo_restore_cred(&old);
+
+- if (!err) {
+- ssize_t fh;
++ lo_restore_cred(&old);
+
+- pthread_mutex_lock(&lo->mutex);
+- fh = lo_add_fd_mapping(lo, fd);
+- pthread_mutex_unlock(&lo->mutex);
+- if (fh == -1) {
+- close(fd);
+- err = ENOMEM;
+- goto out;
+- }
++ /* Ignore the error if file exists and O_EXCL was not given */
++ if (err && (err != EEXIST || (fi->flags & O_EXCL))) {
++ goto out;
++ }
+
+- fi->fh = fh;
+- err = lo_do_lookup(req, parent, name, &e, NULL);
++ err = lo_do_lookup(req, parent, name, &e, &inode);
++ if (err) {
++ goto out;
+ }
+- if (lo->cache == CACHE_NONE) {
+- fi->direct_io = 1;
+- } else if (lo->cache == CACHE_ALWAYS) {
+- fi->keep_cache = 1;
++
++ err = lo_do_open(lo, inode, fd, fi);
++ fd = -1; /* lo_do_open() takes ownership of fd */
++ if (err) {
++ /* Undo lo_do_lookup() nlookup ref */
++ unref_inode_lolocked(lo, inode, 1);
+ }
+
+ out:
++ lo_inode_put(lo, &inode);
+ lo_inode_put(lo, &parent_inode);
+
+ if (err) {
++ if (fd >= 0) {
++ close(fd);
++ }
++
+ fuse_reply_err(req, err);
+ } else {
+ fuse_reply_create(req, &e, fi);
+@@ -1770,7 +1812,6 @@ static struct lo_inode_plock *lookup_create_plock_ctx(struct lo_data *lo,
+ pid_t pid, int *err)
+ {
+ struct lo_inode_plock *plock;
+- char procname[64];
+ int fd;
+
+ plock =
+@@ -1787,12 +1828,10 @@ static struct lo_inode_plock *lookup_create_plock_ctx(struct lo_data *lo,
+ }
+
+ /* Open another instance of file which can be used for ofd locks. */
+- sprintf(procname, "%i", inode->fd);
+-
+ /* TODO: What if file is not writable? */
+- fd = openat(lo->proc_self_fd, procname, O_RDWR);
+- if (fd == -1) {
+- *err = errno;
++ fd = lo_inode_open(lo, inode, O_RDWR);
++ if (fd < 0) {
++ *err = -fd;
+ free(plock);
+ return NULL;
+ }
+@@ -1949,7 +1988,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
+ return;
+ }
+
+- err = lo_do_open(lo, inode, fi);
++ err = lo_do_open(lo, inode, -1, fi);
+ lo_inode_put(lo, &inode);
+ if (err) {
+ fuse_reply_err(req, err);
+@@ -2014,39 +2053,40 @@ static void lo_flush(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
+ static void lo_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
+ struct fuse_file_info *fi)
+ {
++ struct lo_inode *inode = lo_inode(req, ino);
++ struct lo_data *lo = lo_data(req);
+ int res;
+ int fd;
+- char *buf;
+
+ fuse_log(FUSE_LOG_DEBUG, "lo_fsync(ino=%" PRIu64 ", fi=0x%p)\n", ino,
+ (void *)fi);
+
+- if (!fi) {
+- struct lo_data *lo = lo_data(req);
+-
+- res = asprintf(&buf, "%i", lo_fd(req, ino));
+- if (res == -1) {
+- return (void)fuse_reply_err(req, errno);
+- }
++ if (!inode) {
++ fuse_reply_err(req, EBADF);
++ return;
++ }
+
+- fd = openat(lo->proc_self_fd, buf, O_RDWR);
+- free(buf);
+- if (fd == -1) {
+- return (void)fuse_reply_err(req, errno);
++ if (!fi) {
++ fd = lo_inode_open(lo, inode, O_RDWR);
++ if (fd < 0) {
++ res = -fd;
++ goto out;
+ }
+ } else {
+ fd = lo_fi_fd(req, fi);
+ }
+
+ if (datasync) {
+- res = fdatasync(fd);
++ res = fdatasync(fd) == -1 ? errno : 0;
+ } else {
+- res = fsync(fd);
++ res = fsync(fd) == -1 ? errno : 0;
+ }
+ if (!fi) {
+ close(fd);
+ }
+- fuse_reply_err(req, res == -1 ? errno : 0);
++out:
++ lo_inode_put(lo, &inode);
++ fuse_reply_err(req, res);
+ }
+
+ static void lo_read(fuse_req_t req, fuse_ino_t ino, size_t size, off_t offset,
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 05/64] archiver: Fix typos
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (3 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 04/64] qemu: Fix CVE-2020-35517 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 06/64] busybox: fix CVE-2021-28831 Anuj Mittal
` (58 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Daniel Ammann <daniel.ammann@bytesatwork.ch>
Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 36de56496bc07c321162555d603fac756297911a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/archiver.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 858507b343..a3962306b1 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -118,7 +118,7 @@ python () {
d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_patched' % pn)
elif ar_src == "configured":
# We can't use "addtask do_ar_configured after do_configure" since it
- # will cause the deptask of do_populate_sysroot to run not matter what
+ # will cause the deptask of do_populate_sysroot to run no matter what
# archives we need, so we add the depends here.
# There is a corner case with "gcc-source-${PV}" recipes, they don't have
@@ -163,7 +163,7 @@ python () {
d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_configured' % pn)
}
-# Take all the sources for a recipe and puts them in WORKDIR/archiver-work/.
+# Take all the sources for a recipe and put them in WORKDIR/archiver-work/.
# Files in SRC_URI are copied directly, anything that's a directory
# (e.g. git repositories) is "unpacked" and then put into a tarball.
python do_ar_original() {
@@ -463,7 +463,7 @@ python do_unpack_and_patch() {
ar_sysroot_native = d.getVar('STAGING_DIR_NATIVE')
pn = d.getVar('PN')
- # The kernel class functions require it to be on work-shared, so we dont change WORKDIR
+ # The kernel class functions require it to be on work-shared, so we don't change WORKDIR
if not is_work_shared(d):
# Change the WORKDIR to make do_unpack do_patch run in another dir.
d.setVar('WORKDIR', ar_workdir)
@@ -505,7 +505,7 @@ python do_unpack_and_patch() {
# of the output file ensures that we create it each time the recipe
# gets rebuilt, at least as long as a PR server is used. We also rely
# on that mechanism to catch changes in the file content, because the
-# file content is not part of of the task signature either.
+# file content is not part of the task signature either.
do_ar_recipe[vardepsexclude] += "BBINCLUDED"
python do_ar_recipe () {
"""
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 06/64] busybox: fix CVE-2021-28831
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (4 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 05/64] archiver: Fix typos Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 07/64] linux-yocto/5.4: update to v5.4.109 Anuj Mittal
` (57 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Backport patch to fix CVE-2021-28831.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e579dbd9a6b2472ca90f411c0b594da9e38c9aca)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 58 +++++++++++++++++++
meta/recipes-core/busybox/busybox_1.33.0.bb | 3 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
new file mode 100644
index 0000000000..67c9f189cc
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
@@ -0,0 +1,58 @@
+From fe791386ebc270219ca00406c9fdadc5130b64ee Mon Sep 17 00:00:00 2001
+From: Samuel Sapalski <samuel.sapalski@nokia.com>
+Date: Wed, 3 Mar 2021 16:31:22 +0100
+Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt
+
+On certain corrupt gzip files, huft_build will set the error bit on
+the result pointer. If afterwards abort_unzip is called huft_free
+might run into a segmentation fault or an invalid pointer to
+free(p).
+
+In order to mitigate this, we check in huft_free if the error bit
+is set and clear it before the linked list is freed.
+
+Signed-off-by: Samuel Sapalski <samuel.sapalski@nokia.com>
+Signed-off-by: Peter Kaestle <peter.kaestle@nokia.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+
+Upstream-Status: Backport
+CVE: CVE-2021-28831
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ archival/libarchive/decompress_gunzip.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
+index eb3b64930..e93cd5005 100644
+--- a/archival/libarchive/decompress_gunzip.c
++++ b/archival/libarchive/decompress_gunzip.c
+@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
+ * each table.
+ * t: table to free
+ */
++#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
++#define ERR_RET ((huft_t*)(uintptr_t)1)
+ static void huft_free(huft_t *p)
+ {
+ huft_t *q;
+
++ /*
++ * If 'p' has the error bit set we have to clear it, otherwise we might run
++ * into a segmentation fault or an invalid pointer to free(p)
++ */
++ if (BAD_HUFT(p)) {
++ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
++ }
++
+ /* Go through linked list, freeing from the malloced (t[-1]) address. */
+ while (p) {
+ q = (--p)->v.t;
+@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
+ * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
+ * is given: "fixed inflate" decoder feeds us such data.
+ */
+-#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
+-#define ERR_RET ((huft_t*)(uintptr_t)1)
+ static huft_t* huft_build(const unsigned *b, const unsigned n,
+ const unsigned s, const struct cp_ext *cp_ext,
+ unsigned *m)
diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb b/meta/recipes-core/busybox/busybox_1.33.0.bb
index 1a3f218bca..58e9cf7fce 100644
--- a/meta/recipes-core/busybox/busybox_1.33.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.33.0.bb
@@ -46,7 +46,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \
file://rev.cfg \
file://pgrep.cfg \
-"
+ file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \
+ "
SRC_URI_append_libc-musl = " file://musl.cfg "
SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 07/64] linux-yocto/5.4: update to v5.4.109
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (5 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 06/64] busybox: fix CVE-2021-28831 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 08/64] linux-yocto/5.10: update to v5.10.27 Anuj Mittal
` (56 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
4e85f8a712cd Linux 5.4.109
057dd3e6986b xen-blkback: don't leak persistent grants from xen_blkbk_map()
ce934540ff09 can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"
2638770e793b ext4: add reclaim checks to xattr code
92b9e3deffb6 mac80211: fix double free in ibss_leave
ae23957bd1fb net: qrtr: fix a kernel-infoleak in qrtr_recvmsg()
f7a962970001 net: dsa: b53: VLAN filtering is global to all users
f866d1fa48e4 can: dev: Move device back to init netns on owning netns delete
dfd6627c83dd x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc()
f989059cd22a locking/mutex: Fix non debug version of mutex_lock_io_nested()
1260d8dc2d66 scsi: mpt3sas: Fix error return code of mpt3sas_base_attach()
d31747705762 scsi: qedi: Fix error return code of qedi_alloc_global_queues()
063c3cfb264b scsi: Revert "qla2xxx: Make sure that aborted commands are freed"
fdc61af371db block: recalculate segment count for multi-segment discards correctly
8ce9f6efa655 perf auxtrace: Fix auxtrace queue conflict
bc0b1a2036dd ACPI: scan: Use unique number for instance_no
b382f9d61609 ACPI: scan: Rearrange memory allocation in acpi_device_add()
cc578c3e612b Revert "netfilter: x_tables: Update remaining dereference to RCU"
19a5fb4ceada netfilter: x_tables: Use correct memory barriers.
c46cd29b89da Revert "netfilter: x_tables: Switch synchronization to RCU"
e74d46e69a45 bpf: Don't do bpf_cgroup_storage_set() for kuprobe/tp programs
01398e024ba6 RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
78aafa0240bc PM: EM: postpone creating the debugfs dir till fs_initcall
f54b10114d63 net/mlx5e: Fix error path for ethtool set-priv-flag
fa4addf30c2c PM: runtime: Defer suspending suppliers
c82d289fe958 arm64: kdump: update ppos when reading elfcorehdr
8bf90e000c10 drm/msm: fix shutdown hook in case GPU components failed to bind
4fda26d2f7e1 libbpf: Fix BTF dump of pointer-to-array-of-struct
4f71aacd6c92 selftests: forwarding: vxlan_bridge_1d: Fix vxlan ecn decapsulate value
4ecf6d486e45 net: stmmac: dwmac-sun8i: Provide TX and RX fifo sizes
1f103ca31c51 r8152: limit the RX buffer size of RTL8153A for USB 2.0
048d0bf8ad19 net: cdc-phonet: fix data-interface release on probe failure
ecc62c3b1b57 octeontx2-af: fix infinite loop in unmapping NPC counter
7e9a48ceccae octeontx2-af: Fix irq free in rvu teardown
e15823801229 libbpf: Use SOCK_CLOEXEC when opening the netlink socket
7722378c4a0a nfp: flower: fix pre_tun mask id allocation
060deac22f87 mac80211: fix rate mask reset
52cc7bad1275 can: m_can: m_can_rx_peripheral(): fix RX being blocked by errors
059c1996017d can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
e484616a9600 can: c_can: move runtime PM enable/disable to c_can_platform
4f71965ee897 can: c_can_pci: c_can_pci_remove(): fix use-after-free
42e49b3aa536 can: kvaser_pciefd: Always disable bus load reporting
e3ca9fbfcdf5 can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate
fb4a6ac4851a can: peak_usb: add forgotten supported devices
0a8046daba17 tcp: relookup sock for RST+ACK packets handled by obsolete req sock
67319a8df5d3 netfilter: ctnetlink: fix dump of the expect mask attribute
c4dd0b36cce4 selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed
9d06cabe3bf4 ftgmac100: Restart MAC HW once
81c591299da3 net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
d00db63edd0a e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
9f02a5658413 e1000e: add rtnl_lock() to e1000_reset_task
71fa8051f2f4 igc: Fix Supported Pause Frame Link Setting
35d8a780fa2b igc: Fix Pause Frame Advertising
da8af444b325 net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
267b79a11046 net: sched: validate stab values
76909a298ebb macvlan: macvlan_count_rx() needs to be aware of preemption
c6b6c7a92fe5 ipv6: fix suspecious RCU usage warning
40fa14bbe3fe net/mlx5e: Don't match on Geneve options in case option masks are all zero
e64e327c7fab libbpf: Fix INSTALL flag order
53f1483984bf veth: Store queue_mapping independently of XDP prog presence
f259a7fdeb12 bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
e6587d142d02 dm ioctl: fix out of bounds array access when no devices
7b6944f18cec dm verity: fix DM_VERITY_OPTS_MAX value
752589cd4ea8 integrity: double check iint_cache was initialized
f3404a677770 ARM: dts: at91-sama5d27_som1: fix phy address to 7
1815a24b9483 arm64: dts: ls1043a: mark crypto engine dma coherent
7447c05e06c4 arm64: dts: ls1012a: mark crypto engine dma coherent
b6f866bbf7ca arm64: dts: ls1046a: mark crypto engine dma coherent
e980bd1f7f60 ACPI: video: Add missing callback back for Sony VPCEH3U1E
431aaecd24ac gcov: fix clang-11+ support
4748b6d56efe kasan: fix per-page tags for non-page_alloc pages
037ecab65eb6 squashfs: fix xattr id and id lookup sanity checks
79b8814d6765 squashfs: fix inode lookup sanity checks
5b1abfe7d620 platform/x86: intel-vbtn: Stop reporting SW_DOCK events
599cbcda68ee netsec: restore phy power state after controller reset
8aa97ae0f5d9 ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
cb1504b30b6f ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
37732ea82e09 block: Suppress uevent for hidden device when removed
a2d07d077eb3 nfs: we don't support removing system.nfs4_acl
eed4e1abc997 nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
5fc284999c4a nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
526abcb05c61 nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
8cdbee05b83f drm/radeon: fix AGP dependency
5a0e3fcbeb5a drm/amdgpu: fb BO should be ttm_bo_type_device
fc8e4af4c3ef drm/amd/display: Revert dram_clock_change_latency for DCN2.1
6292d84c8af4 regulator: qcom-rpmh: Correct the pmic5_hfsmps515 buck
c45182707277 u64_stats,lockdep: Fix u64_stats_init() vs lockdep
f59604786a48 habanalabs: Call put_pid() when releasing control device
694761bfdd76 sparc64: Fix opcode filtering in handling of no fault loads
11efb0cda655 irqchip/ingenic: Add support for the JZ4760
69423418c5eb cifs: change noisy error message to FYI
981ba9c9a529 atm: idt77252: fix null-ptr-dereference
6b2844ad7b17 atm: uPD98402: fix incorrect allocation
40d0a9297f83 net: davicom: Use platform_get_irq_optional()
b90de232a806 net: wan: fix error return code of uhdlc_init()
0da0f199e767 net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch()
ab60e4f5eb3a NFS: Correct size calculation for create reply length
785be28d360f nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
d605afb11945 gpiolib: acpi: Add missing IRQF_ONESHOT
f6c1da94ddb3 cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev
1d2c9669135f cifs: ask for more credit on async read/write code paths
ec7ce1e337ec gianfar: fix jumbo packets+napi+rx overrun crash
7ef7d296b154 sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
d25f579ec557 net: intel: iavf: fix error return code of iavf_init_get_resources()
d4dd6de6fc90 net: tehuti: fix error return code in bdx_probe()
e224a789d4a6 ixgbe: Fix memleak in ixgbe_configure_clsu32
537653a0698b ALSA: hda: ignore invalid NHLT table
bd272f11a9d4 Revert "r8152: adjust the settings about MAC clock speed down for RTL8153"
7a12167636bf atm: lanai: dont run lanai_dev_close if not open
fb0067fcda6a atm: eni: dont release is never initialized
614a4ba66854 powerpc/4xx: Fix build errors from mfdcr()
45c1ca3e5784 net: fec: ptp: avoid register access when ipg clock is disabled
d0f5726ab1df hugetlbfs: hugetlb_fault_mutex_hash() cleanup
b90344f7d600 Linux 5.4.108
819eb4d7a85e cifs: Fix preauth hash corruption
cf113ffd620d x86/apic/of: Fix CPU devicetree-node lookups
288be0ed9b36 genirq: Disable interrupts for force threaded handlers
b8ebe853abca firmware/efi: Fix a use after bug in efi_mem_reserve_persistent
31e17169a116 efi: use 32-bit alignment for efi_guid_t literals
886dbe0e338b ext4: fix potential error in ext4_do_update_inode
2f65ae3a7ee3 ext4: do not try to set xattr into ea_inode if value is empty
474aab448436 ext4: find old entry again if failed to rename whiteout
de2e1603c125 x86: Introduce TS_COMPAT_RESTART to fix get_nr_restart_syscall()
076b60af926b x86: Move TS_COMPAT back to asm/thread_info.h
27ddd2b59045 kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()
f546965c3aac x86/ioapic: Ignore IRQ2 again
da326ba3b84a perf/x86/intel: Fix a crash caused by zero PEBS status
51a2b19b554c PCI: rpadlpar: Fix potential drc_name corruption in store functions
796fc331c3cf counter: stm32-timer-cnt: fix ceiling write max value
850ca1c0130a iio: hid-sensor-temperature: Fix issues of timestamp channel
31a2e804ad4a iio: hid-sensor-prox: Fix scale not correct issue
3fa27c8749cf iio: hid-sensor-humidity: Fix alignment issue of timestamp channel
4458ae8d4001 iio: adc: ad7949: fix wrong ADC result due to incorrect bit mask
a605c095bb46 iio: gyro: mpu3050: Fix error handling in mpu3050_trigger_handler
87163fbba6d2 iio: adis16400: Fix an error code in adis16400_initial_setup()
ed0625334b94 iio:adc:qcom-spmi-vadc: add default scale to LR_MUX2_BAT_ID channel
08414c498b4b iio:adc:stm32-adc: Add HAS_IOMEM dependency
b0a595269e62 usb: typec: tcpm: Invoke power_supply_changed for tcpm-source-psy-
4baade6fd6e5 usb: gadget: configfs: Fix KASAN use-after-free
c92aebf2b0f3 USB: replace hardcode maximum usb string length by definition
f89366164693 usbip: Fix incorrect double assignment to udc->ud.tcp_rx
251949ec9d95 usb-storage: Add quirk to defeat Kindle's automatic unload
81b56afc2841 nvme-rdma: fix possible hang when failing to set io queues
b891d41d01f4 counter: stm32-timer-cnt: Report count function when SLAVE_MODE_DISABLED
86fd6c0d22a5 scsi: myrs: Fix a double free in myrs_cleanup()
eb46392d329a scsi: lpfc: Fix some error codes in debugfs
1f925558e3f1 riscv: Correct SPARSEMEM configuration
7db8f3be034d kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again
1dad483b1ebc net/qrtr: fix __netdev_alloc_skb call
f0b09d547713 sunrpc: fix refcount leak for rpc auth modules
3c57ea09365f vfio: IOMMU_API should be selected
b439aac77360 svcrdma: disable timeouts on rdma backchannel
d1ae8f16c223 NFSD: Repair misuse of sv_lock in 5.10.16-rt30.
4c5fab560cb0 nfsd: Don't keep looking up unhashed files in the nfsd file cache
49545a7b8b30 nvmet: don't check iosqes,iocqes for discovery controllers
cf7d7728d8a5 nvme-tcp: fix a NULL deref when receiving a 0-length r2t PDU
36a4f9164cf6 nvme-tcp: fix possible hang when failing to set io queues
81c1dbe1070c nvme: fix Write Zeroes limitations
6712b7fcef9d afs: Stop listxattr() from listing "afs.*" attributes
c71b93323f37 ASoC: simple-card-utils: Do not handle device clock
e029384c1835 ASoC: SOF: intel: fix wrong poll bits in dsp power down
626a484d1ec2 ASoC: SOF: Intel: unregister DMIC device on probe error
db3d39bcd66a ASoC: fsl_ssi: Fix TDM slot setup for I2S mode
24c553371add btrfs: fix slab cache flags for free space tree bitmap
5b3b99525c4f btrfs: fix race when cloning extent buffer during rewind of an old root
a3e438db75fb ARM: 9044/1: vfp: use undef hook for VFP support detection
a47b395d441d ARM: 9030/1: entry: omit FP emulation for UND exceptions taken in kernel mode
34794bc0e768 s390/vtime: fix increased steal time accounting
ba4342094d71 Revert "PM: runtime: Update device status before letting suppliers suspend"
62cf220630a0 ALSA: hda/realtek: Apply headset-mic quirks for Xiaomi Redmibook Air
613fd762d188 ALSA: hda: generic: Fix the micmute led init state
5a5f85603e6e ALSA: hda/realtek: apply pin quirk for XiaomiNotebook Pro
4d35c01a3645 ALSA: dice: fix null pointer dereference when node is disconnected
d0fc0e7bfda2 ASoC: ak5558: Add MODULE_DEVICE_TABLE
a592a4c2889e ASoC: ak4458: Add MODULE_DEVICE_TABLE
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a6aecb7e564f067b786cdec5b2eedd7fc3f2f13d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 2ffc8ed542..8c4c94577b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "65bbe689d98a007848008be2c8edeb5fa8066829"
-SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
+SRCREV_machine ?= "918e7836663cbad861b254f181d3545977d4492f"
+SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
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}"
-LINUX_VERSION ?= "5.4.107"
+LINUX_VERSION ?= "5.4.109"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 2b6e35a69c..5a392742ca 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.107"
+LINUX_VERSION ?= "5.4.109"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "ac3cbab1d6692d4a032dfffe0a604f39a634d18a"
-SRCREV_machine ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
+SRCREV_machine_qemuarm ?= "1dd2723e9895767d459c7c60c0074b3bce5c0d52"
+SRCREV_machine ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 245c3d574b..d925fe7a72 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "ea4097dbff5a148265018e1a998e02b5a05e3d27"
-SRCREV_machine_qemuarm64 ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_machine_qemumips ?= "230ca33504faef6f40c5d3b24901aaacb901c9a6"
-SRCREV_machine_qemuppc ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_machine_qemuriscv64 ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_machine_qemux86 ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_machine_qemux86-64 ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_machine_qemumips64 ?= "84e071a893ef9cea8a8ffbcd233b47a2bc9056b5"
-SRCREV_machine ?= "cf76c5c0dc0edd51ae4a75a1f8701a2675e87c72"
-SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
+SRCREV_machine_qemuarm ?= "f4d1abedbb7a850f9ccb058c2c63f1dffc46e485"
+SRCREV_machine_qemuarm64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_machine_qemumips ?= "7f54002c5db332f2a8a9c842f1d6aa56e3946cb8"
+SRCREV_machine_qemuppc ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_machine_qemuriscv64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_machine_qemux86 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_machine_qemux86-64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_machine_qemumips64 ?= "0addc7475d8fc1e8ca6f33ec90bf4b78085c0975"
+SRCREV_machine ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
+SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.107"
+LINUX_VERSION ?= "5.4.109"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 08/64] linux-yocto/5.10: update to v5.10.27
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (6 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 07/64] linux-yocto/5.4: update to v5.4.109 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 09/64] linux-yocto-dev: add features/scsi/scsi-debug.scc features/gpio/mockup.scc to KERNEL_FEATURES Anuj Mittal
` (55 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
472493c8a425 Linux 5.10.27
3a1ca9bd4f5a xen-blkback: don't leak persistent grants from xen_blkbk_map()
03a1c3253f25 can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"
f12d05f70282 nvme: fix the nsid value to print in nvme_validate_or_alloc_ns
36478a9ec5af Revert "net: bonding: fix error return code of bond_neigh_init()"
451ba16cc5b7 Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"
df61d3cff422 fs/ext4: fix integer overflow in s_log_groups_per_flex
0229b5926dc9 ext4: add reclaim checks to xattr code
25e809bf8bec mac80211: fix double free in ibss_leave
39e1a35ea65a net: dsa: b53: VLAN filtering is global to all users
d3b5a04b8ce5 r8169: fix DMA being used after buffer free if WoL is enabled
8dc08a2962c8 can: dev: Move device back to init netns on owning netns delete
24256b4d87eb ch_ktls: fix enum-conversion warning
6f15c02ebbe9 fs/cachefiles: Remove wait_bit_key layout dependency
002ea848d7fd mm/memcg: fix 5.10 backport of splitting page memcg
2c163520e12b x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc()
c6c9bc4f261d locking/mutex: Fix non debug version of mutex_lock_io_nested()
d4ce2a8f465d cifs: Adjust key sizes and key generation routines for AES256 encryption
86cc799e1d9d smb3: fix cached file size problems in duplicate extents (reflink)
2423511cc5ba scsi: mpt3sas: Fix error return code of mpt3sas_base_attach()
6b977fea78de scsi: qedi: Fix error return code of qedi_alloc_global_queues()
62bb066cdfb6 scsi: Revert "qla2xxx: Make sure that aborted commands are freed"
fc062d21c011 block: recalculate segment count for multi-segment discards correctly
dcf2dfc1614d io_uring: fix provide_buffers sign extension
efb334c4e5ff perf synthetic events: Avoid write of uninitialized memory when generating PERF_RECORD_MMAP* records
5febe60a8021 perf auxtrace: Fix auxtrace queue conflict
4a5891992c68 ACPI: scan: Use unique number for instance_no
2ba9964a9653 ACPI: scan: Rearrange memory allocation in acpi_device_add()
c33f918758fa Revert "netfilter: x_tables: Update remaining dereference to RCU"
de2e6b4e32d6 mm/mmu_notifiers: ensure range_end() is paired with range_start()
42aa210795d8 dm table: Fix zoned model check and zone sectors check
3fdebc2d8e79 netfilter: x_tables: Use correct memory barriers.
520be4d1af9c Revert "netfilter: x_tables: Switch synchronization to RCU"
87771c9b09bb net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M
485335a637c8 net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S
837a3ae33459 net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay()
9a5267264fc2 net: phy: introduce phydev->port
c4934e65c8bc net: axienet: Fix probe error cleanup
3e08fd4a8298 net: axienet: Properly handle PCS/PMA PHY for 1000BaseX mode
d65e7d0c7449 igb: avoid premature Rx buffer reuse
c7eb3e12f18f net, bpf: Fix ip6ip6 crash with collect_md populated skbs
0a245acbce89 net: Consolidate common blackhole dst ops
33cd5f88b5bf bpf: Don't do bpf_cgroup_storage_set() for kuprobe/tp programs
d95696f537d6 RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
b740e58324c8 xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG
889c56ea941e octeontx2-af: Fix memory leak of object buf
558454ec5170 net: bridge: don't notify switchdev for local FDB addresses
7d019b2d0f27 PM: EM: postpone creating the debugfs dir till fs_initcall
08a5f812ad6c net/mlx5e: Fix error path for ethtool set-priv-flag
624f0dc8f7f4 net/mlx5e: Offload tuple rewrite for non-CT flows
c83207bb02d6 net/mlx5e: Allow to match on MPLS parameters only for MPLS over UDP
0be13d01473a net/mlx5: Add back multicast stats for uplink representor
65c021e73590 PM: runtime: Defer suspending suppliers
3db5fc556515 arm64: kdump: update ppos when reading elfcorehdr
447a011bb40d drm/msm: Fix suspend/resume on i.MX5
c7552dee62a0 drm/msm: fix shutdown hook in case GPU components failed to bind
0b7bc92c1986 can: isotp: tx-path: zero initialize outgoing CAN frames
ccd5565feea3 bpf: Fix umd memory leak in copy_process()
eeadce8811d3 libbpf: Fix BTF dump of pointer-to-array-of-struct
7693b64ae508 selftests: forwarding: vxlan_bridge_1d: Fix vxlan ecn decapsulate value
5ebb9947b488 selinux: vsock: Set SID for socket returned by accept()
1e01729999c0 net: stmmac: dwmac-sun8i: Provide TX and RX fifo sizes
961d9a6e47b9 r8152: limit the RX buffer size of RTL8153A for USB 2.0
2330d46db081 igb: check timestamp validity
421e0d731070 net: cdc-phonet: fix data-interface release on probe failure
943e1583bf8a net: check all name nodes in __dev_alloc_name
748a158359d7 octeontx2-af: fix infinite loop in unmapping NPC counter
b553f45c76ec octeontx2-pf: Clear RSS enable flag on interace down
11e94cfa9dd8 octeontx2-af: Fix irq free in rvu teardown
da517ca38dc6 octeontx2-af: Remove TOS field from MKEX TX
1055796ca031 octeontx2-af: Modify default KEX profile to extract TX packet fields
f896ae2886d1 octeontx2-af: Formatting debugfs entry rsrc_alloc.
5f64c4c550c8 ipv6: weaken the v4mapped source check
9e48a3bc8ba2 ARM: dts: imx6ull: fix ubi filesystem mount failed
b4c574e4b471 libbpf: Use SOCK_CLOEXEC when opening the netlink socket
86e525bc04f2 libbpf: Fix error path in bpf_object__elf_init()
4280132339ce netfilter: flowtable: Make sure GC works periodically in idle system
186d8dc40a65 netfilter: nftables: allow to update flowtable flags
4a741b4df032 netfilter: nftables: report EOPNOTSUPP on unsupported flowtable flags
a96a8cb0500a net/sched: cls_flower: fix only mask bit check in the validate_ct_state
6233c2d09633 ionic: linearize tso skb with too many frags
7637048707e5 drm/msm/dsi: fix check-before-set in the 7nm dsi_pll code
126aa8f23424 ftrace: Fix modify_ftrace_direct.
29b8834cf828 nfp: flower: fix pre_tun mask id allocation
47dae14b21f7 nfp: flower: add ipv6 bit to pre_tunnel control message
259b0122dea5 nfp: flower: fix unsupported pre_tunnel flows
aeff815e76ef selftests/net: fix warnings on reuseaddr_ports_exhausted
bd63bd78d303 mac80211: Allow HE operation to be longer than expected.
f865127b1d26 mac80211: fix rate mask reset
48d0b548b49e can: m_can: m_can_rx_peripheral(): fix RX being blocked by errors
afaca48e3017 can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
4fcf59c24990 can: c_can: move runtime PM enable/disable to c_can_platform
524320e8034a can: c_can_pci: c_can_pci_remove(): fix use-after-free
f9a5974b9719 can: kvaser_pciefd: Always disable bus load reporting
af3e6c3dcf54 can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate
0cbadc0fb54c can: peak_usb: add forgotten supported devices
3b3d9279be6c can: isotp: TX-path: ensure that CAN frame flags are initialized
f88517dae95b can: isotp: isotp_setsockopt(): only allow to set low level TX flags for CAN-FD
63f2a9bd3133 tcp: relookup sock for RST+ACK packets handled by obsolete req sock
50f41f2e29ff tipc: better validate user input in tipc_nl_retrieve_key()
ddeba5b39cca net: phylink: Fix phylink_err() function name error in phylink_major_config
375f5169f231 net: hdlc_x25: Prevent racing between "x25_close" and "x25_xmit"/"x25_rx"
ee39ee5f437c netfilter: ctnetlink: fix dump of the expect mask attribute
d5380ceede6f selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed
33cc382c5830 flow_dissector: fix byteorder of dissected ICMP ID
fce6fb902189 net: qrtr: fix a kernel-infoleak in qrtr_recvmsg()
6d3635ed12e7 net: ipa: terminate message handler arrays
1701bd22b05d clk: qcom: gcc-sc7180: Use floor ops for the correct sdcc1 clk
b50c46ef67d6 ftgmac100: Restart MAC HW once
e64a5a5b8e93 net: phy: broadcom: Add power down exit reset state delay
87378c850fee net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
648b62f10cec e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
8ed431fec355 e1000e: add rtnl_lock() to e1000_reset_task
5994a096570f igc: Fix igc_ptp_rx_pktstamp()
0963fadcf536 igc: Fix Supported Pause Frame Link Setting
d5330d5cc3ad igc: Fix Pause Frame Advertising
d85ffade499a igc: reinit_locked() should be called with rtnl_lock
4c91fc60e3f6 net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
f64270027928 net: sched: validate stab values
400199d6e6f6 macvlan: macvlan_count_rx() needs to be aware of preemption
2514c7ad115e drop_monitor: Perform cleanup upon probe registration failure
7f041ee8effd ipv6: fix suspecious RCU usage warning
61219de46413 net/mlx5e: Don't match on Geneve options in case option masks are all zero
d0be25fa4f96 net/mlx5e: When changing XDP program without reset, take refs for XSK RQs
60b5ff15b41d net/mlx5e: RX, Mind the MPWQE gaps when calculating offsets
9857de932b30 libbpf: Fix INSTALL flag order
f7c3d7615e6c bpf: Change inode_storage's lookup_elem return value from NULL to -EBADF
926cde9eec67 veth: Store queue_mapping independently of XDP prog presence
f47a9b2570ad soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva
1f798907b435 ARM: OMAP2+: Fix smartreflex init regression after dropping legacy data
965e6cb8d4c9 bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
921aae17bb0f dm ioctl: fix out of bounds array access when no devices
d8b36c483d47 dm verity: fix DM_VERITY_OPTS_MAX value
1e2d70d08ade drm/i915: Fix the GT fence revocation runtime PM logic
da6a9b5b1799 drm/amdgpu: Add additional Sienna Cichlid PCI ID
dc28098f40b4 drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x
e02f765fa784 drm/amd/pm: workaround for audio noise issue
f771b2b3eb2f drm/etnaviv: Use FOLL_FORCE for userptr
546f7fcc451c integrity: double check iint_cache was initialized
5f7b515df003 ARM: dts: at91-sama5d27_som1: fix phy address to 7
2a0d35962ff1 ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet
0b6cd8802d32 ARM: dts: at91: sam9x60: fix mux-mask for PA7 so it can be set to A, B and C
1c103f512251 arm64: dts: ls1043a: mark crypto engine dma coherent
4f35b64ba823 arm64: dts: ls1012a: mark crypto engine dma coherent
3883f335b5ee arm64: dts: ls1046a: mark crypto engine dma coherent
1ced45535d4b arm64: stacktrace: don't trace arch_stack_walk()
53d3c8063590 ACPICA: Always create namespace nodes using acpi_ns_create_node()
36fe73bd0af9 ACPI: video: Add missing callback back for Sony VPCEH3U1E
1f5c9efad9fe gcov: fix clang-11+ support
6e63cc1fe253 kasan: fix per-page tags for non-page_alloc pages
fe03ccc3ce90 hugetlb_cgroup: fix imbalanced css_get and css_put pair for shared mappings
269042e8ffed squashfs: fix xattr id and id lookup sanity checks
61d72c5952c4 squashfs: fix inode lookup sanity checks
1d215fcbc4ef z3fold: prevent reclaim/free race for headless pages
e4642090734e psample: Fix user API breakage
a4be7e4ed5d9 platform/x86: intel-vbtn: Stop reporting SW_DOCK events
4f67d3e8c0ac netsec: restore phy power state after controller reset
19c9967e495e selinux: fix variable scope issue in live sidtab conversion
9731e08a3381 selinux: don't log MAC_POLICY_LOAD record on failed policy load
3b87d0c5834b btrfs: fix sleep while in non-sleep context during qgroup removal
771dfb3c531d KVM: x86: Protect userspace MSR filter with SRCU, and set atomically-ish
394e4fd67946 static_call: Fix static_call_set_init()
0fefb5f3e574 static_call: Fix the module key fixup
a63068e93917 static_call: Allow module use without exposing static_call_key
433cd7ca386c static_call: Pull some static_call declarations to the type headers
533c293f737c ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
d76e207991c4 ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
7077d5e7f074 mm/fork: clear PASID for new mm
07feac84efc6 block: Suppress uevent for hidden device when removed
9f704608010b nfs: we don't support removing system.nfs4_acl
3dab008e23bd nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
8f0534c96ac8 nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
c7b3f6db97c2 nvme-core: check ctrl css before setting up zns
9083dc773d67 nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
4d6aea29a795 nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
7e62a89b51dd nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
d8b17df7bf80 nvme: simplify error logic in nvme_validate_ns()
b91230a0013f drm/radeon: fix AGP dependency
35d4f0712828 drm/amdgpu: fb BO should be ttm_bo_type_device
a255d14eb5dc drm/amd/display: Revert dram_clock_change_latency for DCN2.1
d27b0964ade9 block: Fix REQ_OP_ZONE_RESET_ALL handling
c9d1f6ad1e25 regulator: qcom-rpmh: Correct the pmic5_hfsmps515 buck
6366a5bb888b kselftest: arm64: Fix exit code of sve-ptrace
da5bc0c21c04 u64_stats,lockdep: Fix u64_stats_init() vs lockdep
f89338395545 staging: rtl8192e: fix kconfig dependency on CRYPTO
eb4154fb61e2 habanalabs: Call put_pid() when releasing control device
f2b38f03a3f7 sparc64: Fix opcode filtering in handling of no fault loads
58b34195b33f umem: fix error return code in mm_pci_probe()
feaa91193ad3 kbuild: dummy-tools: fix inverted tests for gcc
ede8be3ae078 kbuild: add image_name to no-sync-config-targets
264bb27b9fe4 irqchip/ingenic: Add support for the JZ4760
b684c380f0b9 cifs: change noisy error message to FYI
758bca385a79 atm: idt77252: fix null-ptr-dereference
f35954a3961b atm: uPD98402: fix incorrect allocation
852143ed96e2 net: enetc: set MAC RX FIFO to recommended value
697082b125b0 net: davicom: Use platform_get_irq_optional()
e6946ef43848 net: wan: fix error return code of uhdlc_init()
184dc037575c net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch()
9d1a5392aca1 NFS: Correct size calculation for create reply length
2479c6b9ef36 nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
b48779c863c0 gpiolib: acpi: Add missing IRQF_ONESHOT
9443aef16fca cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev
6d7dce3bdfc4 gfs2: fix use-after-free in trans_drain
419ebba40dbf cifs: ask for more credit on async read/write code paths
b8bfda6e08b8 gianfar: fix jumbo packets+napi+rx overrun crash
2d0fba5a2e9f sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
81b1a8f14436 net: intel: iavf: fix error return code of iavf_init_get_resources()
5f86016bdfa7 net: tehuti: fix error return code in bdx_probe()
71b996c9b883 blk-cgroup: Fix the recursive blkg rwstat
b171748b7953 scsi: ufs: ufs-qcom: Disable interrupt in reset path
028210541b3c ixgbe: Fix memleak in ixgbe_configure_clsu32
4dc123500c3b ALSA: hda: ignore invalid NHLT table
18f27fc6bcc2 Revert "r8152: adjust the settings about MAC clock speed down for RTL8153"
f8f6190094a3 atm: lanai: dont run lanai_dev_close if not open
6f6e45947572 atm: eni: dont release is never initialized
75e967a04d37 powerpc/4xx: Fix build errors from mfdcr()
4a104e4d4d9d net: fec: ptp: avoid register access when ipg clock is disabled
50c75680bdce net: stmmac: fix dma physical address of descriptor when display ring
a9daba140178 mt76: fix tx skb error handling in mt76_dma_tx_queue_skb
efb12c03fcd0 mm/memcg: set memcg when splitting page
6143a1d193e9 mm/memcg: rename mem_cgroup_split_huge_fixup to split_page_memcg and add nr_pages argument
856cd02bbdd4 Linux 5.10.26
de1126ea44bb cifs: Fix preauth hash corruption
21536d7b7e6f x86/apic/of: Fix CPU devicetree-node lookups
95247d24c4d4 genirq: Disable interrupts for force threaded handlers
80b2787789af firmware/efi: Fix a use after bug in efi_mem_reserve_persistent
47ba0d4d2afb efi: use 32-bit alignment for efi_guid_t literals
e5154ea8e48f static_call: Fix static_call_update() sanity check
51ccdd25d7e5 MAINTAINERS: move the staging subsystem to lists.linux.dev
4c9a74798ef1 MAINTAINERS: move some real subsystems off of the staging mailing list
35ecf664fd6c ext4: fix rename whiteout with fast commit
e8fa569465e5 ext4: fix potential error in ext4_do_update_inode
6163a0662b79 ext4: do not try to set xattr into ea_inode if value is empty
d130b802f98a ext4: stop inode update before return
258db8e6ffdc ext4: find old entry again if failed to rename whiteout
9689ecadf8a7 ext4: fix error handling in ext4_end_enable_verity()
e4ea2a28d068 efivars: respect EFI_UNSUPPORTED return from firmware
a548acde9608 x86: Introduce TS_COMPAT_RESTART to fix get_nr_restart_syscall()
97c608959c27 x86: Move TS_COMPAT back to asm/thread_info.h
4523e648b7b7 kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()
0e245256e34d x86/ioapic: Ignore IRQ2 again
4fdf5f4ba61f perf/x86/intel: Fix unchecked MSR access error caused by VLBR_EVENT
514ea597be8e perf/x86/intel: Fix a crash caused by zero PEBS status
be1f58e58f76 PCI: rpadlpar: Fix potential drc_name corruption in store functions
6d4e1fed18d0 counter: stm32-timer-cnt: fix ceiling miss-alignment with reload register
cbc4c42dbec0 counter: stm32-timer-cnt: fix ceiling write max value
dcdde25844d4 iio: hid-sensor-temperature: Fix issues of timestamp channel
7de97c4bba51 iio: hid-sensor-prox: Fix scale not correct issue
fd8efe16d867 iio: hid-sensor-humidity: Fix alignment issue of timestamp channel
b477c121a287 iio: adc: adi-axi-adc: add proper Kconfig dependencies
d894acab2844 iio: adc: ad7949: fix wrong ADC result due to incorrect bit mask
533ee1e28455 iio: adc: ab8500-gpadc: Fix off by 10 to 3
f8bfbd3917fa iio: gyro: mpu3050: Fix error handling in mpu3050_trigger_handler
06c281c23ace iio: adis16400: Fix an error code in adis16400_initial_setup()
531231485844 iio:adc:qcom-spmi-vadc: add default scale to LR_MUX2_BAT_ID channel
3ce2e7b2d360 iio:adc:stm32-adc: Add HAS_IOMEM dependency
6c3c90058b95 thunderbolt: Increase runtime PM reference count on DP tunnel discovery
f4ca082e3f59 thunderbolt: Initialize HopID IDAs in tb_switch_alloc()
c7bb96a37dd2 usb: dwc3: gadget: Prevent EP queuing while stopping transfers
395d273f2998 usb: dwc3: gadget: Allow runtime suspend if UDC unbinded
8b8a84234c38 usb: typec: tcpm: Invoke power_supply_changed for tcpm-source-psy-
0ea3fb15a87e usb: typec: Remove vdo[3] part of tps6598x_rx_identity_reg struct
0f882bcc6407 usb: gadget: configfs: Fix KASAN use-after-free
22e85a6a35cc usbip: Fix incorrect double assignment to udc->ud.tcp_rx
7046e5f7a2f6 usb-storage: Add quirk to defeat Kindle's automatic unload
5a62d6d7afa0 powerpc: Force inlining of cpu_has_feature() to avoid build failure
2bdef2b476e2 gfs2: bypass signal_our_withdraw if no journal
a602e830ddaf gfs2: move freeze glock outside the make_fs_rw and _ro functions
49787b1bba1f gfs2: Add common helper for holding and releasing the freeze glock
db37238f3452 regulator: pca9450: Clear PRESET_EN bit to fix BUCK1/2/3 voltage setting
cfbff8bd9efc regulator: pca9450: Enable system reset on WDOG_B assertion
775691b94ce7 regulator: pca9450: Add SD_VSEL GPIO for LDO5
9392b8219b62 net: bonding: fix error return code of bond_neigh_init()
76f496681d6a io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return
3c08f772ad0d io_uring: don't attempt IO reissue from the ring exit path
40345b9c9d90 drm/amd/pm: fulfill the Polaris implementation for get_clock_by_type_with_latency()
e8e99acd0830 s390/qeth: schedule TX NAPI on QAOB completion
f3f6765fd0e8 ibmvnic: remove excessive irqsave
96823c1e9997 media: cedrus: h264: Support profile controls
1c20e9040f49 io_uring: fix inconsistent lock state
e1a69079edc4 iwlwifi: Add a new card for MA family
e7f6ebde21cf drm/amd/display: turn DPMS off on connector unplug
559b842a64ff MIPS: compressed: fix build with enabled UBSAN
8545519b1f51 net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081
33cafc7952a4 i40e: Fix endianness conversions
41d4c889b274 powerpc/sstep: Fix darn emulation
8a335142f1c5 powerpc/sstep: Fix load-store and update emulation
8b4a797e86a0 RDMA/mlx5: Allow creating all QPs even when non RDMA profile is used
bb38c1c03384 scsi: isci: Pass gfp_t flags in isci_port_bc_change_received()
d74238028a11 scsi: isci: Pass gfp_t flags in isci_port_link_up()
d9f5efd1afc4 scsi: isci: Pass gfp_t flags in isci_port_link_down()
1eda358e37e5 scsi: mvsas: Pass gfp_t flags to libsas event notifiers
58bdc321beb5 scsi: libsas: Introduce a _gfp() variant of event notifiers
18c3c04e8e53 scsi: libsas: Remove notifier indirection
29c5b80327b7 scsi: pm8001: Neaten debug logging macros and uses
c4186c00adc1 scsi: pm80xx: Fix pm8001_mpi_get_nvmd_resp() race condition
3e4b3770744d scsi: pm80xx: Make running_req atomic
6075c84a98ce scsi: pm80xx: Make mpi_build_cmd locking consistent
d802672c7f00 module: harden ELF info handling
e2c8978a75e0 module: avoid *goto*s in module_sig_check()
8587715b65fa module: merge repetitive strings in module_sig_check()
c02a33f0fd28 RDMA/rtrs: Fix KASAN: stack-out-of-bounds bug
904a52dd9e50 RDMA/rtrs: Introduce rtrs_post_send
9e97c211b701 RDMA/rtrs-srv: Jump to dereg_mr label if allocate iu fails
5abee8b1fc4f RDMA/rtrs: Remove unnecessary argument dir of rtrs_iu_free
4ebd8f0c82a5 bpf: Declare __bpf_free_used_maps() unconditionally
0e44f1e18398 serial: stm32: fix DMA initialization error handling
5f8659adf7a2 tty: serial: stm32-usart: Remove set but unused 'cookie' variables
20c0bd2b6579 ibmvnic: serialize access to work queue on remove
f8ba6913c40a ibmvnic: add some debugs
b4be6e6e2696 nvme-rdma: fix possible hang when failing to set io queues
b3901ceb120d gpiolib: Assign fwnode to parent's if no primary one provided
c5fe922eaf1a counter: stm32-timer-cnt: Report count function when SLAVE_MODE_DISABLED
f854abe46b0e RISC-V: correct enum sbi_ext_rfence_fid
359d8ff40a09 scsi: ufs: ufs-mediatek: Correct operator & -> &&
38089ba4b20c scsi: myrs: Fix a double free in myrs_cleanup()
eb9d08b34351 scsi: lpfc: Fix some error codes in debugfs
e95c0d43509c riscv: Correct SPARSEMEM configuration
04eb2b2fa12f cifs: fix allocation size on newly created files
bb2e41e65c33 kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again
72714560fbc7 net/qrtr: fix __netdev_alloc_skb call
6cae8095490c io_uring: ensure that SQPOLL thread is started for exit
a7acb614287b pstore: Fix warning in pstore_kill_sb()
5f7d470696ad i915/perf: Start hrtimer only if sampling the OA buffer
cb14e99e886f sunrpc: fix refcount leak for rpc auth modules
2ea2d3a79800 vhost_vdpa: fix the missing irq_bypass_unregister_producer() invocation
3e5a1bb6ea20 vfio: IOMMU_API should be selected
c2219627091c svcrdma: disable timeouts on rdma backchannel
982b899ba672 NFSD: fix dest to src mount in inter-server COPY
800369d61add NFSD: Repair misuse of sv_lock in 5.10.16-rt30.
12628e7779f8 nfsd: don't abort copies early
5ea0aa29ad4b nfsd: Don't keep looking up unhashed files in the nfsd file cache
628f39a57a46 nvmet: don't check iosqes,iocqes for discovery controllers
b4f911e3a982 nvme-tcp: fix a NULL deref when receiving a 0-length r2t PDU
7089cdfce32f nvme-tcp: fix possible hang when failing to set io queues
a83e5c6c35fa nvme-tcp: fix misuse of __smp_processor_id with preemption enabled
fd9e2b999740 nvme: fix Write Zeroes limitations
2d202085d2dd ALSA: usb-audio: Fix unintentional sign extension issue
64195f022ae8 afs: Stop listxattr() from listing "afs.*" attributes
78ba4793b084 afs: Fix accessing YFS xattrs on a non-YFS server
07fa872bf79c ASoC: simple-card-utils: Do not handle device clock
d1ab87e31761 ASoC: qcom: lpass-cpu: Fix lpass dai ids parse
1ae54de79fba ASoC: codecs: wcd934x: add a sanity check in set channel map
03079a0f1bf7 ASoC: qcom: sdm845: Fix array out of range on rx slim channels
26b08c08a5f3 ASoC: qcom: sdm845: Fix array out of bounds access
47a6cadb6cfd ASoC: SOF: intel: fix wrong poll bits in dsp power down
b94b71a7a6f6 ASoC: SOF: Intel: unregister DMIC device on probe error
4da5a9a73c4c ASoC: Intel: bytcr_rt5640: Fix HP Pavilion x2 10-p0XX OVCD current threshold
118cfdc770cd ASoC: fsl_ssi: Fix TDM slot setup for I2S mode
223dc51caa51 drm/amd/display: Correct algorithm for reversed gamma
4daa70a80c68 vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails
49ca3100fbaf vhost-vdpa: fix use-after-free of v->config_ctx
2c8d6a9474f0 btrfs: fix slab cache flags for free space tree bitmap
38ffe9eaeb7c btrfs: fix race when cloning extent buffer during rewind of an old root
78486cf1f31e zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()
9c1c5e81a002 zonefs: prevent use of seq files as swap file
dfbdbf0f359a zonefs: Fix O_APPEND async write handling
38c74f2f2318 s390/pci: fix leak of PCI device structure
075e3034740c s390/pci: remove superfluous zdev->zbus check
bd37d9b9c4fb s390/pci: refactor zpci_create_device()
015916ca0266 s390/vtime: fix increased steal time accounting
5c0a3a331dc5 Revert "PM: runtime: Update device status before letting suppliers suspend"
68525e424175 ALSA: hda/realtek: fix mute/micmute LEDs for HP 850 G8
f086deab2c64 ALSA: hda/realtek: fix mute/micmute LEDs for HP 440 G8
7b00df1894c6 ALSA: hda/realtek: fix mute/micmute LEDs for HP 840 G8
14af4bf8d481 ALSA: hda/realtek: Apply headset-mic quirks for Xiaomi Redmibook Air
4c698a3b8fb7 ALSA: hda: generic: Fix the micmute led init state
e6c7cdf0baf3 ALSA: hda/realtek: apply pin quirk for XiaomiNotebook Pro
cd7b17ba8e4d ALSA: dice: fix null pointer dereference when node is disconnected
422806f8d289 spi: cadence: set cqspi to the driver_data field of struct device
f8d5ced57b07 ASoC: ak5558: Add MODULE_DEVICE_TABLE
064a7289b445 ASoC: ak4458: Add MODULE_DEVICE_TABLE
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cbb5c4392c63f896f204c0c15b0cfa7a364feed2)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index cb34887cda..3e08b5aec5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "be2935bce35f9adb6d0e735d42651e81a5094adf"
-SRCREV_meta ?= "031f6c76e488a3563f35258c72ff1de3e25a512e"
+SRCREV_machine ?= "8262073e1b09920fb55a32d698c3a98c3af628eb"
+SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
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.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.25"
+LINUX_VERSION ?= "5.10.27"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 83e59b0ebb..92c15e9b5b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.25"
+LINUX_VERSION ?= "5.10.27"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "0f87ec9fea7a5695cd063d9d11d89751efa53ddd"
-SRCREV_machine ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_meta ?= "031f6c76e488a3563f35258c72ff1de3e25a512e"
+SRCREV_machine_qemuarm ?= "2825075bb360f256c3a9dcdf3cf67b34423d657d"
+SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 026e69511a..f89f513878 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "d8551cae1ccdbe062a5c6068ce39ea8f4e1c72db"
-SRCREV_machine_qemuarm64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemumips ?= "7f1f1ad2f2d90b1b070c6b0a82f0add9aa492e37"
-SRCREV_machine_qemuppc ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemuriscv64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemuriscv32 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemux86 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemux86-64 ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_machine_qemumips64 ?= "fd5ac097b891642eea13659bea536f3ec5910d6d"
-SRCREV_machine ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
-SRCREV_meta ?= "031f6c76e488a3563f35258c72ff1de3e25a512e"
+SRCREV_machine_qemuarm ?= "0441d737d347be0b8bcf9bef0b7707d5ba2741a0"
+SRCREV_machine_qemuarm64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemumips ?= "5fbc41f5c569e11bf5e56beea77c432efa69b99e"
+SRCREV_machine_qemuppc ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemuriscv64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemuriscv32 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemux86 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemux86-64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_machine_qemumips64 ?= "a60cf276769d28c6c495dbf2816a50871705d5eb"
+SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
+SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.25"
+LINUX_VERSION ?= "5.10.27"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 09/64] linux-yocto-dev: add features/scsi/scsi-debug.scc features/gpio/mockup.scc to KERNEL_FEATURES
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (7 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 08/64] linux-yocto/5.10: update to v5.10.27 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 10/64] linux-yocto/5.10: BSP configuration fixes Anuj Mittal
` (54 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: He Zhe <zhe.he@windriver.com>
Add features/scsi/scsi-debug.scc and features/gpio/mockup.scc to
KERNEL_FEATURES to meet ptest requirement as what we did for other
linux-yocto*.
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fd27f302df886c27cb424191c27152ad9d0e8d80)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 8725473d1c..ee41d612fd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -50,5 +50,7 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc
KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
KERNEL_VERSION_SANITY_SKIP = "1"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 10/64] linux-yocto/5.10: BSP configuration fixes
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (8 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 09/64] linux-yocto-dev: add features/scsi/scsi-debug.scc features/gpio/mockup.scc to KERNEL_FEATURES Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 11/64] linux-yocto/5.10: update to v5.10.29 Anuj Mittal
` (53 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following commit(s) to linux-yocto/5.10.:
fa039db710c qemuppc64: Enable the RTC driver
f6cfc23fbfc nxp-s32g2xx: add HSE UIO related configs to make hse demo work
2b445fb1e0b firmware: fix CONFIG_FW_LOADER option mismatch warning
60dde01d949 nxp-imx8: Correct DRM_TTM config and delete redundant config
07119316ee5 xlnx: bsp: drop obsolete kernel options for xilinx-zynqmp and xilinx-zynq
0cf78165f8e bcm-2xxx-rpi: update v5.10 kernel config for raspberrypi 4b platform
9b5a9e46778 marvell-cn96xx: Add the preempt-rt support
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6186f21b29e7a152d34c620e81878bf6eff6519d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.10.bb | 4 ++--
.../linux/linux-yocto-tiny_5.10.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 3e08b5aec5..1896b2f295 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "8262073e1b09920fb55a32d698c3a98c3af628eb"
-SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
+SRCREV_machine ?= "57f0dabaec5ad65d936350e9b1f69791c8ddf97e"
+SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
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.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 92c15e9b5b..a7b93fce7a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "2825075bb360f256c3a9dcdf3cf67b34423d657d"
-SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
+SRCREV_machine_qemuarm ?= "ae643fde3bb3d99f194ec0b6b9662bdd1d508c2f"
+SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index f89f513878..d480fc27c7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "0441d737d347be0b8bcf9bef0b7707d5ba2741a0"
-SRCREV_machine_qemuarm64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemumips ?= "5fbc41f5c569e11bf5e56beea77c432efa69b99e"
-SRCREV_machine_qemuppc ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemuriscv64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemuriscv32 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemux86 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemux86-64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_machine_qemumips64 ?= "a60cf276769d28c6c495dbf2816a50871705d5eb"
-SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a"
-SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a"
+SRCREV_machine_qemuarm ?= "036f0e96d68be58be2e97ea7cab11f9ca2fb8e1c"
+SRCREV_machine_qemuarm64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemumips ?= "46964fe445c229120a9733ed98dcd5ab8454c999"
+SRCREV_machine_qemuppc ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemuriscv64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemuriscv32 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemux86 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemux86-64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_machine_qemumips64 ?= "efe9e0c23330929c92a364d2497b231d1325ef29"
+SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
+SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 11/64] linux-yocto/5.10: update to v5.10.29
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (9 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 10/64] linux-yocto/5.10: BSP configuration fixes Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 12/64] linux-yocto/5.4: update to v5.4.111 Anuj Mittal
` (52 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
d8cf82b410b4 Linux 5.10.29
cef13a04376b init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
ba02635769f1 init/Kconfig: make COMPILE_TEST depend on !S390
faa30969f66e bpf, x86: Validate computation of branch displacements for x86-32
3edb8967d91e bpf, x86: Validate computation of branch displacements for x86-64
f890246ae75c tools/resolve_btfids: Add /libbpf to .gitignore
76983e244908 kbuild: Do not clean resolve_btfids if the output does not exist
0945d67e5d43 kbuild: Add resolve_btfids clean to root clean target
eff1e0465727 tools/resolve_btfids: Set srctree variable unconditionally
f60c918b07b7 tools/resolve_btfids: Check objects before removing
249719092447 tools/resolve_btfids: Build libbpf and libsubcmd in separate directories
2934985086b9 math: Export mul_u64_u64_div_u64
7345d4b2d421 io_uring: fix timeout cancel return code
8f9049e70cd6 cifs: Silently ignore unknown oplock break handle
fee111089cc9 cifs: revalidate mapping when we open files for SMB1 POSIX
42498ee67296 ia64: fix format strings for err_inject
bc30fdd598e3 ia64: mca: allocate early mca with GFP_ATOMIC
b008489d8b86 selftests/vm: fix out-of-tree build
47f8bc68ae95 scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
266d3106efbd ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation
f135b89e286b platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms
037950869be3 block: clear GD_NEED_PART_SCAN later in bdev_disk_changed
7c73059bf849 x86/build: Turn off -fcf-protection for realmode targets
6372aa9a78f8 drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
6deb9d9a84a2 kselftest/arm64: sve: Do not use non-canonical FFR register value
bcd57b07fd90 platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
6304295c6190 net: ipa: fix init header command validation
8a57256e0548 netfilter: nftables: skip hook overlap logic if flowtable is stale
b0c795f4cc53 netfilter: conntrack: Fix gre tunneling over ipv6
439c2c22fb85 drm/msm: Ratelimit invalid-fence message
57e0546f01ca drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
b9ec77ef36af drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate
0a66bd60b1ce mac80211: choose first enabled channel for monitor
7705c48b8695 mac80211: Check crypto_aead_encrypt for errors
05878b681981 mISDN: fix crash in fritzpci
4ca265610cc6 kunit: tool: Fix a python tuple typing error
f0ed115feccc net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
4b4ce9895e64 net/mlx5e: Enforce minimum value check for ICOSQ size
198afc3b0c01 bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp
107875a53868 platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
4c875e034dfb bus: ti-sysc: Fix warning on unbind if reset is not deasserted
5c6f778e8f7d ARM: dts: am33xx: add aliases for mmc interfaces
ecdfb9d70fb8 Linux 5.10.28
7973a0dad073 bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG
12b5f9dae410 Revert "kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing"
6ae5eaee1ea5 riscv: evaluate put_user() arg before enabling user access
61f0c3e8098f drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
d06d0b3cf626 driver core: clear deferred probe reason on probe retry
d29c38dd926d staging: rtl8192e: Change state information from u16 to u8
538b96315375 staging: rtl8192e: Fix incorrect source in memcpy()
84e5203fd277 soc: qcom-geni-se: Cleanup the code to remove proxy votes
996a5782faef usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable
1808ee421ce5 usb: dwc3: qcom: skip interconnect init for ACPI probe
137dfed1552a usb: dwc2: Prevent core suspend when port connection flag is 0
4e28aca96729 usb: dwc2: Fix HPRT0.PrtSusp bit setting for HiKey 960 board.
77c0d6af858b usb: gadget: udc: amd5536udc_pci fix null-ptr-dereference
6f86681691c2 USB: cdc-acm: fix use-after-free after probe failure
64deff1f4e0f USB: cdc-acm: fix double free on probe failure
439a27521112 USB: cdc-acm: downgrade message to debug
511302531eb8 USB: cdc-acm: untangle a circular dependency between callback and softint
e700e3aec303 cdc-acm: fix BREAK rx code path adding necessary calls
9efa606a83e0 usb: xhci-mtk: fix broken streams issue on 0.96 xHCI
1addcb1f77d6 usb: musb: Fix suspend with devices connected for a64
15e61d9ae7ac USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem
4027d6e88fef usbip: vhci_hcd fix shift out-of-bounds in vhci_hub_control()
c04adcc819d3 firewire: nosy: Fix a use-after-free bug in nosy_ioctl()
2c7d85026324 video: hyperv_fb: Fix a double free in hvfb_probe
a267a7e1c0ca usb: dwc3: pci: Enable dis_uX_susphy_quirk for Intel Merrifield
bf4c643192b3 firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0
3b681a1c43b6 extcon: Fix error handling in extcon_dev_register
023d13952e9b extcon: Add stubs for extcon_register_notifier_all() functions
0fe56e294cef pinctrl: rockchip: fix restore error in resume
80ee9e02be3d vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends
d2308dd5119b drm/tegra: sor: Grab runtime PM reference across reset
f552f95853f8 drm/tegra: dc: Restore coupling of display controllers
77a8e6f792d5 drm/imx: fix memory leak when fails to init
74612ecdf263 reiserfs: update reiserfs_xattrs_initialized() condition
8c71f5b30955 drm/amdgpu: check alignment on CPU page for bo map
78ceecd2ed45 drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings()
28f901fe1634 drm/amdkfd: dqm fence memory corruption
ec3e06e06f76 mm: fix race by making init_zero_pfn() early_initcall
d88b557b9b73 s390/vdso: fix tod_steering_delta type
b332265430c8 s390/vdso: copy tod_steering_delta value to vdso_data page
f706acc9312b tracing: Fix stack trace event size
cc038ab785a8 PM: runtime: Fix ordering in pm_runtime_get_suppliers()
da2976cd711b PM: runtime: Fix race getting/putting suppliers at probe
e6d8eb65532e KVM: SVM: ensure that EFER.SVME is set when running nested guest or on nested vmexit
5f6625f5cd5c KVM: SVM: load control fields from VMCB12 before checking them
6aaa3c2ebb4f xtensa: move coprocessor_flush to the .text section
a3be911a5fee xtensa: fix uaccess-related livelock in do_page_fault
bcd7999c03ed ALSA: hda/realtek: fix mute/micmute LEDs for HP 640 G8
ee58eee4501f ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook
f235ffa56b8e ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO
6d91f3afb632 ALSA: hda: Add missing sanity checks in PM prepare/complete callbacks
b3116cda4e52 ALSA: hda: Re-add dropped snd_poewr_change_state() calls
474d3d65784e ALSA: usb-audio: Apply sample rate quirk to Logitech Connect
e525cd364c09 ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead()
cdd192a20b06 ACPI: tables: x86: Reserve memory occupied by ACPI tables
fd38d4e6757b bpf: Remove MTU check in __bpf_skb_max_len
ff64f33bc93b net: 9p: advance iov on empty read
84877db1cdea net: wan/lmc: unregister device when no matching device is found
33a6b3eea44b net: ipa: fix register write command validation
44d76042c038 net: ipa: remove two unused register definitions
c805f215e9c5 appletalk: Fix skb allocation size in loopback case
f2294a707f63 net: ethernet: aquantia: Handle error cleanup of start on open
7d3ffc0993fe ath10k: hold RCU lock when calling ieee80211_find_sta_by_ifaddr()
221528c20e5e iwlwifi: pcie: don't disable interrupts for reg_lock
f33d87047323 netdevsim: dev: Initialize FIB module after debugfs
660bf76aec07 rtw88: coex: 8821c: correct antenna switch function
b5777172cce2 ath11k: add ieee80211_unregister_hw to avoid kernel crash caused by NULL pointer
731c4447e6db brcmfmac: clear EAP/association status bits on linkdown events
4094194d103b can: tcan4x5x: fix max register value
1a5751d58b14 net: introduce CAN specific pointer in the struct net_device
9e35159c6e9a can: dev: move driver related infrastructure into separate subdir
e3ccad57ac09 flow_dissector: fix TTL and TOS dissection on IPv4 fragments
8fe47a33944f net: mvpp2: fix interrupt mask/unmask skip condition
44c816c8b9ab io_uring: call req_set_fail_links() on short send[msg]()/recv[msg]() with MSG_WAITALL
5038c1122e13 ext4: do not iput inode under running transaction in ext4_rename()
eb8049d85a92 static_call: Align static_call_is_init() patching condition
21c2bbc17b6b io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls
fa068ee3f37e nvmet-tcp: fix kmap leak when data digest in use
3ac4aaff387b locking/ww_mutex: Fix acquire/release imbalance in ww_acquire_init()/ww_acquire_fini()
905ef030bdf9 locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling
1e2a75c24a48 thermal/core: Add NULL pointer check before using cooling device stats
cf51b6145b9d ASoC: rt711: add snd_soc_component remove callback
805645d89a20 ASoC: rt5659: Update MCLK rate in set_sysclk()
7d4344fd3ee0 staging: comedi: cb_pcidas64: fix request_irq() warn
e833d5716fbb staging: comedi: cb_pcidas: fix request_irq() warn
4cd96a0de7a1 scsi: qla2xxx: Fix broken #endif placement
3860814ef620 scsi: st: Fix a use after free in st_open()
861fc287e036 io_uring: fix ->flags races by linked timeouts
e1f8c95c1110 vhost: Fix vhost_vq_reset()
7f6518ec6ee9 kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing
540a1ebf3c23 NFSD: fix error handling in NFSv4.0 callbacks
73df108e3aec ASoC: cs42l42: Always wait at least 3ms after reset
9b7b92c4b92d ASoC: cs42l42: Fix mixer volume control
20b39eb99598 ASoC: cs42l42: Fix channel width support
0d3753babfa7 ASoC: cs42l42: Fix Bitclock polarity inversion
ed47acc0c888 ASoC: soc-core: Prevent warning if no DMI table is present
294d4c2b4fda ASoC: es8316: Simplify adc_pga_gain_tlv table
f134a436d766 ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe
b057d540ad2c ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10
ed4cdb772680 ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10
4bac395e0b8a ASoC: rt1015: fix i2c communication error
4eff80b14014 iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate
5fb71b231c4e rpc: fix NULL dereference on kmalloc failure
9e9aa1c03c33 fs: nfsd: fix kconfig dependency warning for NFSD_V4
e178f362f095 ext4: fix bh ref count on error paths
4b3139576a20 ext4: shrink race window in ext4_should_retry_alloc()
1bfb046d29e3 virtiofs: Fail dax mount if device does not support it
e21d2b92354b bpf: Fix fexit trampoline.
68abc0115617 arm64: mm: correct the inside linear map range during hotplug check
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 255ec8ff86d31c3464c30c26bdb15f01563b088e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 1896b2f295..ce88554830 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "57f0dabaec5ad65d936350e9b1f69791c8ddf97e"
-SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
+SRCREV_machine ?= "a1cb83d2e69b4c895cefa0e8716c8e9021d757bf"
+SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
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.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.27"
+LINUX_VERSION ?= "5.10.29"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index a7b93fce7a..3581f3b4b0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.27"
+LINUX_VERSION ?= "5.10.29"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "ae643fde3bb3d99f194ec0b6b9662bdd1d508c2f"
-SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
+SRCREV_machine_qemuarm ?= "bbc9efbcc604d823555794878f966b2ad7e5f4ca"
+SRCREV_machine ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index d480fc27c7..278f8a67fe 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "036f0e96d68be58be2e97ea7cab11f9ca2fb8e1c"
-SRCREV_machine_qemuarm64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemumips ?= "46964fe445c229120a9733ed98dcd5ab8454c999"
-SRCREV_machine_qemuppc ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemuriscv64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemuriscv32 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemux86 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemux86-64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_machine_qemumips64 ?= "efe9e0c23330929c92a364d2497b231d1325ef29"
-SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
-SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
+SRCREV_machine_qemuarm ?= "13b4e1548d504dca91ff49abba5be4df728840e6"
+SRCREV_machine_qemuarm64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemumips ?= "ba6c1c115792e0c80412a7e0b54d6003cfbed491"
+SRCREV_machine_qemuppc ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemuriscv64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemuriscv32 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemux86 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemux86-64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_machine_qemumips64 ?= "2e99735de1312c0403ff23cb0c50fa8153e80be7"
+SRCREV_machine ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
+SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.27"
+LINUX_VERSION ?= "5.10.29"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 12/64] linux-yocto/5.4: update to v5.4.111
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (10 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 11/64] linux-yocto/5.10: update to v5.10.29 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 13/64] linux-yocto/5.10: update to v5.10.30 Anuj Mittal
` (51 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
a49e5ea5e045 Linux 5.4.111
45f540622d5b init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
43dd03f08819 init/Kconfig: make COMPILE_TEST depend on !S390
f5eb7e12a75d nvme-mpath: replace direct_make_request with generic_make_request
6cce30548058 bpf, x86: Validate computation of branch displacements for x86-32
a0b3927a07be bpf, x86: Validate computation of branch displacements for x86-64
20c60bbc1c54 cifs: Silently ignore unknown oplock break handle
754c82a6bf48 cifs: revalidate mapping when we open files for SMB1 POSIX
e5991b4fcedb ia64: fix format strings for err_inject
3e9292b39862 ia64: mca: allocate early mca with GFP_ATOMIC
9b872bac1923 scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
e2db0e66139a x86/build: Turn off -fcf-protection for realmode targets
0465098898ef platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
5a8c30e8acad netfilter: conntrack: Fix gre tunneling over ipv6
e84a795b8a0b drm/msm: Ratelimit invalid-fence message
daf5aaa8e6e0 drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
6abe3dad0afe mac80211: choose first enabled channel for monitor
37b51460b25a mISDN: fix crash in fritzpci
901d39f7b2ce net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
dc7c4d30d6e0 net/mlx5e: Enforce minimum value check for ICOSQ size
b0e2b3271236 bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp
e5868baa1e3c platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
422c68101110 bus: ti-sysc: Fix warning on unbind if reset is not deasserted
bec7103b04a9 ARM: dts: am33xx: add aliases for mmc interfaces
59c8e3329268 Linux 5.4.110
cde4e338c2b2 drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
0ca13611d33f staging: rtl8192e: Change state information from u16 to u8
f9974f189c67 staging: rtl8192e: Fix incorrect source in memcpy()
fd5ce87aee48 usb: dwc2: Prevent core suspend when port connection flag is 0
85e1752ae0ed usb: dwc2: Fix HPRT0.PrtSusp bit setting for HiKey 960 board.
26d2284a0580 usb: gadget: udc: amd5536udc_pci fix null-ptr-dereference
25c13ca8302f USB: cdc-acm: fix use-after-free after probe failure
b5aedddb621e USB: cdc-acm: fix double free on probe failure
7220bba3066e USB: cdc-acm: downgrade message to debug
62da51d0e7b7 USB: cdc-acm: untangle a circular dependency between callback and softint
7443350af8cb cdc-acm: fix BREAK rx code path adding necessary calls
58cace45f84b usb: xhci-mtk: fix broken streams issue on 0.96 xHCI
a22e35f7b4fb usb: musb: Fix suspend with devices connected for a64
e94dec2765b5 USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem
2ecf5803557b usbip: vhci_hcd fix shift out-of-bounds in vhci_hub_control()
5ecfad1efbc3 firewire: nosy: Fix a use-after-free bug in nosy_ioctl()
58073dc536a6 extcon: Fix error handling in extcon_dev_register
e3a3d5005e63 extcon: Add stubs for extcon_register_notifier_all() functions
67ff75be1ab1 pinctrl: rockchip: fix restore error in resume
c92e8a8ecb9d vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends
7f93d47677dd reiserfs: update reiserfs_xattrs_initialized() condition
4dc52ce56d63 drm/amdgpu: check alignment on CPU page for bo map
f9b3b70fd468 drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings()
00bd9c22409e mm: fix race by making init_zero_pfn() early_initcall
558ab52776c0 tracing: Fix stack trace event size
07b19a118d2f PM: runtime: Fix ordering in pm_runtime_get_suppliers()
72a667681cc4 PM: runtime: Fix race getting/putting suppliers at probe
b6e7dbf0ed9c xtensa: move coprocessor_flush to the .text section
c3715f06f9ad ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook
09a08fd89996 ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO
3acbf473a885 ALSA: hda: Add missing sanity checks in PM prepare/complete callbacks
65f92e40cc6d ALSA: hda: Re-add dropped snd_poewr_change_state() calls
05dd1a4223c5 ALSA: usb-audio: Apply sample rate quirk to Logitech Connect
42c83e3bca43 bpf: Remove MTU check in __bpf_skb_max_len
aca623d79cb7 net: wan/lmc: unregister device when no matching device is found
f22854911523 appletalk: Fix skb allocation size in loopback case
4ff476b88135 net: ethernet: aquantia: Handle error cleanup of start on open
ee898d95f446 ath10k: hold RCU lock when calling ieee80211_find_sta_by_ifaddr()
0b8dfb61f29a brcmfmac: clear EAP/association status bits on linkdown events
2d0e594c1316 can: tcan4x5x: fix max register value
4ac1feff6ea6 net: introduce CAN specific pointer in the struct net_device
23394679aa56 can: dev: move driver related infrastructure into separate subdir
7ca4feb37e9e flow_dissector: fix TTL and TOS dissection on IPv4 fragments
ee5055593d0e net: mvpp2: fix interrupt mask/unmask skip condition
aa9345d10f0a ext4: do not iput inode under running transaction in ext4_rename()
5e39a73e47ef locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling
84bd602c14b7 thermal/core: Add NULL pointer check before using cooling device stats
50c38f76b51d ASoC: rt5659: Update MCLK rate in set_sysclk()
b6408fd7eb89 staging: comedi: cb_pcidas64: fix request_irq() warn
b9fe8673b874 staging: comedi: cb_pcidas: fix request_irq() warn
7390a1cdf304 scsi: qla2xxx: Fix broken #endif placement
6e79f829e791 scsi: st: Fix a use after free in st_open()
98052c40e3ac vhost: Fix vhost_vq_reset()
57aa4f30911a powerpc: Force inlining of cpu_has_feature() to avoid build failure
dcf4b6e710c7 NFSD: fix error handling in NFSv4.0 callbacks
990a0fa1ccbb ASoC: cs42l42: Always wait at least 3ms after reset
6d197691a1c5 ASoC: cs42l42: Fix mixer volume control
aa74bf73937c ASoC: cs42l42: Fix channel width support
47ae33d5b32b ASoC: cs42l42: Fix Bitclock polarity inversion
5952cf385ceb ASoC: es8316: Simplify adc_pga_gain_tlv table
381679aec216 ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe
57b8a192872a ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10
b75073a37c65 ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10
ca3f8dcd6d94 iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate
c899b8391a54 rpc: fix NULL dereference on kmalloc failure
0e71c59b2450 fs: nfsd: fix kconfig dependency warning for NFSD_V4
9b68d3ed8aa8 ext4: fix bh ref count on error paths
721a6f64c0bc ext4: shrink race window in ext4_should_retry_alloc()
05d891e76dde module: harden ELF info handling
6a8df0821f67 module: avoid *goto*s in module_sig_check()
d9b98ccdfed0 module: merge repetitive strings in module_sig_check()
1a8c5fbe2f1d modsign: print module name along with error message
120589bb0970 ipv6: weaken the v4mapped source check
1225bb45c87b selinux: vsock: Set SID for socket returned by accept()
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 199566a40671ac273028cb44d0bb4494be22c4aa)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 8c4c94577b..b78a163b9c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "918e7836663cbad861b254f181d3545977d4492f"
-SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
+SRCREV_machine ?= "cccae402fe6c1892e4395e25bd482d6bc8f00826"
+SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
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}"
-LINUX_VERSION ?= "5.4.109"
+LINUX_VERSION ?= "5.4.111"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 5a392742ca..059a7196fe 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.109"
+LINUX_VERSION ?= "5.4.111"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "1dd2723e9895767d459c7c60c0074b3bce5c0d52"
-SRCREV_machine ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
+SRCREV_machine_qemuarm ?= "519d4d331aad2c1302530c5af0b4356b6f362be9"
+SRCREV_machine ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index d925fe7a72..92e6a489e0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "f4d1abedbb7a850f9ccb058c2c63f1dffc46e485"
-SRCREV_machine_qemuarm64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_machine_qemumips ?= "7f54002c5db332f2a8a9c842f1d6aa56e3946cb8"
-SRCREV_machine_qemuppc ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_machine_qemuriscv64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_machine_qemux86 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_machine_qemux86-64 ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_machine_qemumips64 ?= "0addc7475d8fc1e8ca6f33ec90bf4b78085c0975"
-SRCREV_machine ?= "08d98ec7a622f02cd6584ec93ad9c135cf0ea538"
-SRCREV_meta ?= "0fdc53770a263755ea5e995d5b74dd9a8cd06d8b"
+SRCREV_machine_qemuarm ?= "eee89fab3a932bbd8a54995a5da2ac15af2d929f"
+SRCREV_machine_qemuarm64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_machine_qemumips ?= "7cafd60186c08ce6d941ad1bcfc539950534a178"
+SRCREV_machine_qemuppc ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_machine_qemuriscv64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_machine_qemux86 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_machine_qemux86-64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_machine_qemumips64 ?= "e7d9c5457ce29ae61c37580888743951f2bf65b9"
+SRCREV_machine ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
+SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.109"
+LINUX_VERSION ?= "5.4.111"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 13/64] linux-yocto/5.10: update to v5.10.30
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (11 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 12/64] linux-yocto/5.4: update to v5.4.111 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 14/64] linux-yocto-rt/5.10: update to -rt34 Anuj Mittal
` (50 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
1e798745fa8e Linux 5.10.30
b451aed56348 Revert "net: sched: bump refcount for new action in ACT replace mode"
a22115c3492f net: ieee802154: stop dump llsec params for monitors
f872fb3feadd net: ieee802154: forbid monitor for del llsec seclevel
a933bcbb1f7f net: ieee802154: forbid monitor for set llsec params
0238c7b47f77 net: ieee802154: fix nl802154 del llsec devkey
d06a96e72803 net: ieee802154: fix nl802154 add llsec key
399f38c420ee net: ieee802154: fix nl802154 del llsec dev
07699fcce052 net: ieee802154: fix nl802154 del llsec key
8bfb45fa131d net: ieee802154: nl-mac: fix check on panid
38731bbcd9f0 net: mac802154: Fix general protection fault
9f51a42d81f6 drivers: net: fix memory leak in peak_usb_create_dev
160ac0d55d52 drivers: net: fix memory leak in atusb_probe
4d9117b7404a net: tun: set tun->dev->addr_len during TUNSETLINK processing
26ab092615f5 cfg80211: remove WARN_ON() in cfg80211_sme_connect
138a6e1dc35e gpiolib: Read "gpio-line-names" from a firmware node
300368c59cf0 net: sched: bump refcount for new action in ACT replace mode
982dd14fba0f dt-bindings: net: ethernet-controller: fix typo in NVMEM
c65a000a236e lockdep: Address clang -Wformat warning printing for %hd
4c4aa344edf4 clk: socfpga: fix iomem pointer cast on 64-bit
674ddb52f94b RAS/CEC: Correct ce_add_elem()'s returned values
253acf2e983b vdpa/mlx5: Fix wrong use of bit numbers
0ddb34c2ccce vdpa/mlx5: should exclude header length and fcs from mtu
5700c3d4abb2 RDMA/addr: Be strict with gid size
e53ff6e59144 i40e: Fix parameters in aq_get_phy_register()
999852207464 drm/vc4: crtc: Reduce PV fifo threshold on hvs4
d8a0861e269d RDMA/qedr: Fix kernel panic when trying to access recv_cq
3fa7ae3f3754 perf report: Fix wrong LBR block sorting
7f40e9332898 RDMA/cxgb4: check for ipv6 address properly while destroying listener
03ad6a2521a0 net/mlx5: Fix PBMC register mapping
1312f11eb33d net/mlx5: Fix PPLM register mapping
f92faf0bdd25 net/mlx5: Fix placement of log_max_flow_counter
f780a0808827 net: hns3: clear VF down state bit before request link status
f473789db536 tipc: increment the tmp aead refcnt before attaching it
3292c4fc9ce2 can: mcp251x: fix support for half duplex SPI host controllers
a96f1ed70927 iwlwifi: fix 11ax disabled bit in the regulatory capability flags
363d610a9652 i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
cc5418973cc9 openvswitch: fix send of uninitialized stack memory in ct limit reply
3e288c3a7d55 net: openvswitch: conntrack: simplify the return expression of ovs_ct_limit_get_default_limit()
3b70c6f26364 perf inject: Fix repipe usage
d9dc1b406cb9 s390/cpcmd: fix inline assembly register clobbering
7943f749f0d2 workqueue: Move the position of debug_work_activate() in __queue_work()
b3f29ed5dd4b clk: fix invalid usage of list cursor in unregister
2307baac56af clk: fix invalid usage of list cursor in register
d9c55b2d3368 net: macb: restore cmp registers on resume path
af36da5becfb net: cls_api: Fix uninitialised struct field bo->unlocked_driver_cb
ffd5f1e87c15 scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs
ff9231ddfec8 scsi: ufs: core: Fix task management request completion timeout
71ee255d0698 mptcp: forbit mcast-related sockopt on MPTCP sockets
24bbfe89b1c7 net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...);
a08d5d3bec53 drm/msm: Set drvdata to NULL when msm_drm_init() fails
7290bf419894 RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files
49cfa2b20193 i40e: Fix display statistics for veb_tc
e8c96b57a781 soc/fsl: qbman: fix conflicting alignment attributes
553290002aa8 xdp: fix xdp_return_frame() kernel BUG throw for page_pool memory model
4cfae7b23889 net/rds: Fix a use after free in rds_message_map_pages
05bbe9d85a4c net/mlx5: Don't request more than supported EQs
86530effd18f net/mlx5e: Fix ethtool indication of connector type
bde64eac2379 net/mlx5e: Fix mapping of ct_label zero
d65b66ca3334 ASoC: sunxi: sun4i-codec: fill ASoC card owner
dcdf0876b040 I2C: JZ4780: Fix bug for Ingenic X1000.
f295dfc831bc net: phy: broadcom: Only advertise EEE for supported modes
7a896e189361 nfp: flower: ignore duplicate merge hints from FW
6af631d1caf2 net: qrtr: Fix memory leak on qrtr_tx_wait failure
dfe7805e6aa6 net/ncsi: Avoid channel_monitor hrtimer deadlock
ae4a8d10ac8b ARM: dts: imx6: pbab01: Set vmmc supply for both SD interfaces
e5e5ecc9d9fd net:tipc: Fix a double free in tipc_sk_mcast_rcv
f273e3726e14 cxgb4: avoid collecting SGE_QBASE regs during traffic
63a64c366ce0 net: dsa: Fix type was not set for devlink port
ed613d96842e gianfar: Handle error code at MAC address change
1eb5f4e00755 ethernet: myri10ge: Fix a use after free in myri10ge_sw_tso
759b44d247c6 mlxsw: spectrum: Fix ECN marking in tunnel decapsulation
d02b68a92905 can: isotp: fix msg_namelen values depending on CAN_REQUIRED_SIZE
1d3837ca7335 can: bcm/raw: fix msg_namelen values depending on CAN_REQUIRED_SIZE
58f8f1074039 xfrm: Provide private skb extensions for segmented and hw offloaded ESP packets
bc0b89a9a28f arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0
d9670f5e77e5 drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit
d38bce5adcd9 sch_red: fix off-by-one checks in red_check_params()
985c9bb1b594 geneve: do not modify the shared tunnel info when PMTU triggers an ICMP reply
f3bc1885746f vxlan: do not modify the shared tunnel info when PMTU triggers an ICMP reply
f33f79703a4e amd-xgbe: Update DMA coherency values
e5a3449ce16a hostfs: fix memory handling in follow_link()
3cc4db1213a4 i40e: Fix kernel oops when i40e driver removes VF's
9856607c9c29 i40e: Added Asym_Pause to supported link modes
d4d4c6a4ca7c virtchnl: Fix layout of RSS structures
95d58bf5ed43 xfrm: Fix NULL pointer dereference on policy lookup
48a443026bb6 ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips
f6db9dbfa6b6 ASoC: SOF: Intel: HDA: fix core status verification
ef4ddd1d6d93 esp: delete NETIF_F_SCTP_CRC bit from features for esp offload
0224432a8fc1 net: xfrm: Localize sequence counter per network namespace
1e6a3b41cf2a ARM: OMAP4: PM: update ROM return address for OSWR and OFF
042b2cad81de ARM: OMAP4: Fix PMIC voltage domains for bionic
1f51cb88e788 regulator: bd9571mwv: Fix AVS and DVFS voltage range
b267688ce007 remoteproc: qcom: pil_info: avoid 64-bit division
c7a175a24b0e xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume
3b74ce529ece xfrm: interface: fix ipv4 pmtu check to honor ip header df
2d62d6980c2b ice: Recognize 860 as iSCSI port in CEE mode
fd92e7aacc16 ice: Refactor DCB related variables out of the ice_port_info struct
4a78ae127803 net: sched: fix err handler in tcf_action_init()
3c7d3d188ca7 KVM: x86/mmu: preserve pending TLB flush across calls to kvm_tdp_mmu_zap_sp
25fc773b21ce KVM: x86/mmu: Don't allow TDP MMU to yield when recovering NX pages
be2c527b5d39 KVM: x86/mmu: Ensure TLBs are flushed for TDP MMU during NX zapping
0aa4dd9e5132 KVM: x86/mmu: Ensure TLBs are flushed when yielding during GFN range zap
3c7a18440638 KVM: x86/mmu: Yield in TDU MMU iter even if no SPTES changed
85f4ff2b06af KVM: x86/mmu: Ensure forward progress when yielding in TDP MMU iter
1cd17c5c9b8a KVM: x86/mmu: Rename goal_gfn to next_last_level_gfn
b4a3a0d27924 KVM: x86/mmu: Merge flush and non-flush tdp_mmu_iter_cond_resched
8f90432d7f59 KVM: x86/mmu: change TDP MMU yield function returns to match cond_resched
5ea9e6038d29 i2c: turn recovery error on init to debug
efa869b68be9 percpu: make pcpu_nr_empty_pop_pages per chunk type
c441949184a9 scsi: target: iscsi: Fix zero tag inside a trace event
d8e7fa8509d7 scsi: pm80xx: Fix chip initialization failure
0c47d8a55f7f driver core: Fix locking bug in deferred_probe_timeout_work_func()
f06cb4641b15 usbip: synchronize event handler with sysfs code paths
28dc9237fe83 usbip: vudc synchronize sysfs code paths
513765b186c9 usbip: stub-dev synchronize sysfs code paths
68be610c19a5 usbip: add sysfs_lock to synchronize sysfs code paths
126ce97d39cf thunderbolt: Fix off by one in tb_port_find_retimer()
256ece954961 thunderbolt: Fix a leak in tb_retimer_add()
b830650c1a0c net: let skb_orphan_partial wake-up waiters.
5d9216b85100 net-ipv6: bugfix - raw & sctp - switch to ipv6_can_nonlocal_bind()
b82816d77875 net: hsr: Reset MAC header for Tx path
9b9c910ccc19 mac80211: fix TXQ AC confusion
cc357c29358d mac80211: fix time-is-after bug in mlme
cc1a702e6ec0 cfg80211: check S1G beacon compat element length
fea52345f422 nl80211: fix potential leak of ACL params
42e4450e3790 nl80211: fix beacon head validation
81692c6add7e net: sched: fix action overwrite reference counting
cdcf3829f418 net: sched: sch_teql: fix null-pointer dereference
422eda625516 vdpa/mlx5: Fix suspend/resume index restoration
89e406e95278 i40e: Fix sparse errors in i40e_txrx.c
12e1438a0946 i40e: Fix sparse error: uninitialized symbol 'ring'
2472ba1c46b4 i40e: Fix sparse error: 'vsi->netdev' could be null
792387118204 i40e: Fix sparse warning: missing error code 'err'
f0b4c9acf5fe net: ensure mac header is set in virtio_net_hdr_to_skb()
72c5de25ba83 bpf, sockmap: Fix incorrect fwd_alloc accounting
00c01de1a994 bpf, sockmap: Fix sk->prot unhash op reset
d921baabd964 bpf: Refcount task stack in bpf_get_task_stack
caef7806141a libbpf: Only create rx and tx XDP rings when necessary
4cc9177b099e libbpf: Restore umem state after socket create failure
5aa7df172207 libbpf: Ensure umem pointer is non-NULL before dereferencing
b52e88638f71 ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx
d86046a77535 bpf: link: Refuse non-O_RDWR flags in BPF_OBJ_GET
b7004ecafade bpf: Enforce that struct_ops programs be GPL-only
3015db3de715 libbpf: Fix bail out from 'ringbuf_process_ring()' on error
dc195928d7e4 net: hso: fix null-ptr-deref during tty device unregistration
c2743e0a631c ice: fix memory leak of aRFS after resuming from suspend
6bd4e822925d iwlwifi: pcie: properly set LTR workarounds on 22000 devices
e5386e87f8aa ice: Cleanup fltr list in case of allocation issues
9d1c342c5018 ice: Use port number instead of PF ID for WoL
b69686110291 ice: Fix for dereference of NULL pointer
4d73a6143d40 ice: remove DCBNL_DEVRESET bit from PF state
286830a8469c ice: fix memory allocation call
4686a26e9536 ice: prevent ice_open and ice_stop during reset
ef7ed8c77d1c ice: Increase control queue timeout
6590b7bfbc2b ice: Continue probe on link/PHY errors
9a7bc0c40367 batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field
d1173effc574 ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin
4941889535f3 parisc: avoid a warning on u8 cast for cmpxchg on u8 pointers
597121792eb4 parisc: parisc-agp requires SBA IOMMU driver
9b54dad28def of: property: fw_devlink: do not link ".*,nr-gpios"
009c5665278b ethtool: fix incorrect datatype in set_eee ops
3a675c1b507f fs: direct-io: fix missing sdio->boundary
b1a5122554ae ocfs2: fix deadlock between setattr and dio_end_io_write
4fabcf229477 nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff
7d9da660affc ia64: fix user_stack_pointer() for ptrace()
8e5bfafedf6d gcov: re-fix clang-11+ support
43908139368e LOOKUP_MOUNTPOINT: we are cleaning "jumped" flag too late
de427b662bfb IB/hfi1: Fix probe time panic when AIP is enabled with a buggy BIOS
856f60e3e800 ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m
8599a39adca8 drm/i915: Fix invalid access to ACPI _DSM objects
bf991df9535e net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits
c4ae852ec940 net: dsa: lantiq_gswip: Don't use PHY auto polling
ba39959bfebd net: dsa: lantiq_gswip: Let GSWIP automatically set the xMII clock
40375bc3d0f9 net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh
005c5afa9f85 xen/evtchn: Change irq_info lock to raw_spinlock_t
a28124e8ad03 selinux: fix race between old and new sidtab
fd75d73aa214 selinux: fix cond_list corruption when changing booleans
4f29b08e238f selinux: make nslot handling in avtab more robust
a12a2fa9a129 nfc: Avoid endless loops caused by repeated llcp_sock_connect()
568ac94df580 nfc: fix memory leak in llcp_sock_connect()
99b596199e84 nfc: fix refcount leak in llcp_sock_connect()
6fb003e5ae18 nfc: fix refcount leak in llcp_sock_bind()
117557711974 ASoC: intel: atom: Stop advertising non working S24LE support
c4a6fb0e8389 ALSA: hda/conexant: Apply quirk for another HP ZBook G5 model
6c9119de7ffe ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1
6efe4c1f4d17 ALSA: aloop: Fix initialization of controls
4c933ff31f21 xfrm/compat: Cleanup WARN()s that can be user-triggered
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit aec9a6d709f14decd65013434f13a26c57e9196f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index ce88554830..b22eb94e41 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "a1cb83d2e69b4c895cefa0e8716c8e9021d757bf"
-SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
+SRCREV_machine ?= "60ca2b8c07383a2d46fef1b668e34dff90c1b404"
+SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
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.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.29"
+LINUX_VERSION ?= "5.10.30"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 3581f3b4b0..54575a7917 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.29"
+LINUX_VERSION ?= "5.10.30"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "bbc9efbcc604d823555794878f966b2ad7e5f4ca"
-SRCREV_machine ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
+SRCREV_machine_qemuarm ?= "ee7efde0c94e8b2eba1a5a2709f2d21874ac7525"
+SRCREV_machine ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 278f8a67fe..e93e41c69b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "13b4e1548d504dca91ff49abba5be4df728840e6"
-SRCREV_machine_qemuarm64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemumips ?= "ba6c1c115792e0c80412a7e0b54d6003cfbed491"
-SRCREV_machine_qemuppc ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemuriscv64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemuriscv32 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemux86 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemux86-64 ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_machine_qemumips64 ?= "2e99735de1312c0403ff23cb0c50fa8153e80be7"
-SRCREV_machine ?= "fd21e2d609ad3343f03d78bc0cbce8da7d7c2a57"
-SRCREV_meta ?= "6dbb20d3127b3380779a11b1552429c5d4a0417e"
+SRCREV_machine_qemuarm ?= "4f13e8499f2bfc9d95dcc70b981ea16351ff088b"
+SRCREV_machine_qemuarm64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemumips ?= "64f8949180b1a6375abef20eebf735e853701c71"
+SRCREV_machine_qemuppc ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemuriscv64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemuriscv32 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemux86 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemux86-64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemumips64 ?= "6bf49ed9b223173d918b7c0140b8d0561bc2674c"
+SRCREV_machine ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.29"
+LINUX_VERSION ?= "5.10.30"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 14/64] linux-yocto-rt/5.10: update to -rt34
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (12 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 13/64] linux-yocto/5.10: update to v5.10.30 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 15/64] linux-yocto/5.4: update to v5.4.112 Anuj Mittal
` (49 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following commit(s) to linux-yocto/5.10:
ac98a75ef2bc net/xfrm: fixup 5.10.30 -stable merge
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2e7dd8afd0dbe7803170006297309b6699b98f34)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index b22eb94e41..20faff811a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,7 +11,7 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "60ca2b8c07383a2d46fef1b668e34dff90c1b404"
+SRCREV_machine ?= "ac98a75ef2bc550f67454bd738ede581c8846ff3"
SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 15/64] linux-yocto/5.4: update to v5.4.112
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (13 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 14/64] linux-yocto-rt/5.10: update to -rt34 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 16/64] linux-yocto/5.4: fix arm defconfig warnings Anuj Mittal
` (48 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
8f55ad4daf00 Linux 5.4.112
ea42fd91d304 Revert "cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath."
7ee5bde3164c net: ieee802154: stop dump llsec params for monitors
b4042ecc12cb net: ieee802154: forbid monitor for del llsec seclevel
e82f8b7713ab net: ieee802154: forbid monitor for set llsec params
948a2817f71d net: ieee802154: fix nl802154 del llsec devkey
b3a105e15cd6 net: ieee802154: fix nl802154 add llsec key
4097afd93df7 net: ieee802154: fix nl802154 del llsec dev
7d32fc7964d6 net: ieee802154: fix nl802154 del llsec key
8f4c815c74f4 net: ieee802154: nl-mac: fix check on panid
38ea2b3ed00f net: mac802154: Fix general protection fault
6e7098f56c83 drivers: net: fix memory leak in peak_usb_create_dev
32e2f9a708e1 drivers: net: fix memory leak in atusb_probe
0a790ad1358b net: tun: set tun->dev->addr_len during TUNSETLINK processing
ed13df88c6d5 cfg80211: remove WARN_ON() in cfg80211_sme_connect
628ac886dfba net: sched: bump refcount for new action in ACT replace mode
3dbafee8426f dt-bindings: net: ethernet-controller: fix typo in NVMEM
f4c5968da773 clk: socfpga: fix iomem pointer cast on 64-bit
35ba6d9240ee RAS/CEC: Correct ce_add_elem()'s returned values
f666ad4f8d87 RDMA/addr: Be strict with gid size
44d03319fe77 RDMA/cxgb4: check for ipv6 address properly while destroying listener
3ca5345db92c net/mlx5: Fix PBMC register mapping
798d94a274fb net/mlx5: Fix placement of log_max_flow_counter
9716aac17419 net: hns3: clear VF down state bit before request link status
9dd7092d1a96 openvswitch: fix send of uninitialized stack memory in ct limit reply
731abf396e37 net: openvswitch: conntrack: simplify the return expression of ovs_ct_limit_get_default_limit()
d0aab59f0993 perf inject: Fix repipe usage
d3343a35d108 s390/cpcmd: fix inline assembly register clobbering
c88fa8d4f994 workqueue: Move the position of debug_work_activate() in __queue_work()
14060454cdb9 clk: fix invalid usage of list cursor in unregister
bedda47d5dce clk: fix invalid usage of list cursor in register
b3717885865c net: macb: restore cmp registers on resume path
c61fe6b7e21f scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs
81fddc7be649 scsi: ufs: core: Fix task management request completion timeout
f6abec1a3172 scsi: ufs: Use blk_{get,put}_request() to allocate and free TMFs
a8d2d45c70c7 scsi: ufs: Avoid busy-waiting by eliminating tag conflicts
c5efc9d26c84 scsi: ufs: Fix irq return code
537a2449cc6f net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...);
de8c5962bdae drm/msm: Set drvdata to NULL when msm_drm_init() fails
e22ce1d21b42 i40e: Fix display statistics for veb_tc
7c0d2372298f soc/fsl: qbman: fix conflicting alignment attributes
c178e8a19937 net/rds: Fix a use after free in rds_message_map_pages
73f88cc2bf5c net/mlx5: Don't request more than supported EQs
029416e14be2 net/mlx5e: Fix ethtool indication of connector type
1f3010fc3fe6 ASoC: sunxi: sun4i-codec: fill ASoC card owner
db4600aa938c net: phy: broadcom: Only advertise EEE for supported modes
6aa7d2621b19 nfp: flower: ignore duplicate merge hints from FW
bbbee59f4f32 net/ncsi: Avoid channel_monitor hrtimer deadlock
c66b672a231c ARM: dts: imx6: pbab01: Set vmmc supply for both SD interfaces
c991ca6a2c79 net:tipc: Fix a double free in tipc_sk_mcast_rcv
200c8453287f cxgb4: avoid collecting SGE_QBASE regs during traffic
e9bdd3e45f0e gianfar: Handle error code at MAC address change
516c436ff5d6 can: bcm/raw: fix msg_namelen values depending on CAN_REQUIRED_SIZE
ca443546f8d4 arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0
840a181729ac sch_red: fix off-by-one checks in red_check_params()
accb27006595 amd-xgbe: Update DMA coherency values
e472f6814ceb hostfs: fix memory handling in follow_link()
613f35568a5d hostfs: Use kasprintf() instead of fixed buffer formatting
fec47d458add i40e: Fix kernel oops when i40e driver removes VF's
c0aacaa0a8f2 i40e: Added Asym_Pause to supported link modes
f819977ad42c xfrm: Fix NULL pointer dereference on policy lookup
bac7e764e5d5 ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips
b32969aaed1c ASoC: SOF: Intel: HDA: fix core status verification
99b4e9af8f00 ASoC: SOF: Intel: hda: remove unnecessary parentheses
540ddeed5c51 esp: delete NETIF_F_SCTP_CRC bit from features for esp offload
a128e07b472b net: xfrm: Localize sequence counter per network namespace
34659399e713 regulator: bd9571mwv: Fix AVS and DVFS voltage range
d78e99dd4960 xfrm: interface: fix ipv4 pmtu check to honor ip header df
7977d5fe3d5b net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits
249908ed36a8 net: dsa: lantiq_gswip: Don't use PHY auto polling
910e785ba8de virtio_net: Add XDP meta data support
0534f1f1bc76 i2c: turn recovery error on init to debug
cafced041915 usbip: synchronize event handler with sysfs code paths
37168011d427 usbip: vudc synchronize sysfs code paths
06fedcc6870e usbip: stub-dev synchronize sysfs code paths
6a435364b608 usbip: add sysfs_lock to synchronize sysfs code paths
b02bded94b91 net: let skb_orphan_partial wake-up waiters.
fd8a95d56050 net-ipv6: bugfix - raw & sctp - switch to ipv6_can_nonlocal_bind()
b5e7653ffdd1 net: hsr: Reset MAC header for Tx path
a9311be5f617 mac80211: fix TXQ AC confusion
5a4f39f19e6f net: sched: sch_teql: fix null-pointer dereference
2f5edf14f62a i40e: Fix sparse error: 'vsi->netdev' could be null
b31d91e9e8c8 i40e: Fix sparse warning: missing error code 'err'
599200ad44e7 net: ensure mac header is set in virtio_net_hdr_to_skb()
158a9b815c54 bpf, sockmap: Fix sk->prot unhash op reset
0242251d6a97 ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx
4a2933c88399 net: hso: fix null-ptr-deref during tty device unregistration
ef2ccf84071f ice: Cleanup fltr list in case of allocation issues
0df579b3de8c ice: Fix for dereference of NULL pointer
1aecc5781101 ice: Increase control queue timeout
9de1caa1103f batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field
79407ae3475e ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin
9dfd74a8c015 parisc: avoid a warning on u8 cast for cmpxchg on u8 pointers
957d0308aa36 parisc: parisc-agp requires SBA IOMMU driver
507c2009dc4c fs: direct-io: fix missing sdio->boundary
f495bedb001b ocfs2: fix deadlock between setattr and dio_end_io_write
52999a66c0b3 nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff
75fd54ea1b60 ia64: fix user_stack_pointer() for ptrace()
7a92396bf8dd gcov: re-fix clang-11+ support
c2b3cf2c70d6 drm/i915: Fix invalid access to ACPI _DSM objects
0e8f850e26b2 net: dsa: lantiq_gswip: Let GSWIP automatically set the xMII clock
6649b5eda131 net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh
a09acbb53934 xen/evtchn: Change irq_info lock to raw_spinlock_t
aa0cff2e0751 nfc: Avoid endless loops caused by repeated llcp_sock_connect()
404daa4d62a3 nfc: fix memory leak in llcp_sock_connect()
41bc58ba0945 nfc: fix refcount leak in llcp_sock_connect()
c89903c9eff2 nfc: fix refcount leak in llcp_sock_bind()
12289d9840d6 ASoC: intel: atom: Stop advertising non working S24LE support
c99780f782aa ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1
da8f3cc5771e ALSA: aloop: Fix initialization of controls
8732c2df9d15 counter: stm32-timer-cnt: fix ceiling miss-alignment with reload register
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bd41c1b7170b4d27bebac0a4387cad070c41e03d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index b78a163b9c..e52c9ebe0e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "cccae402fe6c1892e4395e25bd482d6bc8f00826"
-SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
+SRCREV_machine ?= "324e77d816cf6434507ab29140beb24044009efa"
+SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
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}"
-LINUX_VERSION ?= "5.4.111"
+LINUX_VERSION ?= "5.4.112"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 059a7196fe..f07375c761 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.111"
+LINUX_VERSION ?= "5.4.112"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "519d4d331aad2c1302530c5af0b4356b6f362be9"
-SRCREV_machine ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
+SRCREV_machine_qemuarm ?= "8463db325b93f0669446f68c19334cfe11ffb9c2"
+SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 92e6a489e0..38833ff8f7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "eee89fab3a932bbd8a54995a5da2ac15af2d929f"
-SRCREV_machine_qemuarm64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_machine_qemumips ?= "7cafd60186c08ce6d941ad1bcfc539950534a178"
-SRCREV_machine_qemuppc ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_machine_qemuriscv64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_machine_qemux86 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_machine_qemux86-64 ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_machine_qemumips64 ?= "e7d9c5457ce29ae61c37580888743951f2bf65b9"
-SRCREV_machine ?= "5dba555ee7d5317a9720d33403e1e1f8e560b3fc"
-SRCREV_meta ?= "5973c11656b6d5221a764be1b2f1622c7e905e6c"
+SRCREV_machine_qemuarm ?= "133328e5d558f6060a5633d71506a6b716bb4fc6"
+SRCREV_machine_qemuarm64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_machine_qemumips ?= "eef7365804592f95bceefa143cdb3cc19e8c6b66"
+SRCREV_machine_qemuppc ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_machine_qemuriscv64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_machine_qemux86 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_machine_qemux86-64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_machine_qemumips64 ?= "996fe040c8d8d01a9af6be42dae3844d127471bf"
+SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
+SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.111"
+LINUX_VERSION ?= "5.4.112"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 16/64] linux-yocto/5.4: fix arm defconfig warnings
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (14 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 15/64] linux-yocto/5.4: update to v5.4.112 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 17/64] linux-yocto/5.10: " Anuj Mittal
` (47 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
A recent fix to the kern-tools promoted some previously unseen
issues to warnings. This commit fixes them by tagging some BT
options as non-hardware so they won't generate warnings if they
don't appear in the final .config. These are sub BT options and
shouldn't warn when/if their controlling option is disabled by
a fragment.
d7fd0213b75 base: exclude some BT options as non-hardware
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a86c8251905baf5bf4714f3db01cdfae02383839)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
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(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index e52c9ebe0e..a802a570a1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "324e77d816cf6434507ab29140beb24044009efa"
-SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
+SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
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}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index f07375c761..1edc632de7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "8463db325b93f0669446f68c19334cfe11ffb9c2"
SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
+SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 38833ff8f7..9c8c363713 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
SRCREV_machine_qemux86-64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
SRCREV_machine_qemumips64 ?= "996fe040c8d8d01a9af6be42dae3844d127471bf"
SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_meta ?= "5017570a130f142365dfdcd043d84143fdd6e255"
+SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 17/64] linux-yocto/5.10: fix arm defconfig warnings
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (15 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 16/64] linux-yocto/5.4: fix arm defconfig warnings Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 18/64] nettle: upgrade 3.7.1 -> 3.7.2 Anuj Mittal
` (46 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
A recent fix to the kern-tools promoted some previously unseen
issues to warnings. This commit fixes them by tagging some BT
options as non-hardware so they won't generate warnings if they
don't appear in the final .config. These are sub BT options and
shouldn't warn when/if their controlling option is disabled by
a fragment.
40a967b115f base: exclude some BT options as non-hardware
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fc7875ce3c68a253f8b8e5d8855c1814731b5a45)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 20faff811a..dacff74bce 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "ac98a75ef2bc550f67454bd738ede581c8846ff3"
-SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
+SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189"
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.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 54575a7917..21a2e89115 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "ee7efde0c94e8b2eba1a5a2709f2d21874ac7525"
SRCREV_machine ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
+SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index e93e41c69b..e6859a2319 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -17,13 +17,13 @@ SRCREV_machine_qemuarm ?= "4f13e8499f2bfc9d95dcc70b981ea16351ff088b"
SRCREV_machine_qemuarm64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
SRCREV_machine_qemumips ?= "64f8949180b1a6375abef20eebf735e853701c71"
SRCREV_machine_qemuppc ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_machine_qemuriscv64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_machine_qemuriscv32 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_machine_qemux86 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_machine_qemux86-64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
+SRCREV_machine_qemuriscv64 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11"
+SRCREV_machine_qemuriscv32 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11"
+SRCREV_machine_qemux86 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11"
+SRCREV_machine_qemux86-64 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11"
SRCREV_machine_qemumips64 ?= "6bf49ed9b223173d918b7c0140b8d0561bc2674c"
-SRCREV_machine ?= "8465e471f5b4855d01012a18cd5fa516061c0358"
-SRCREV_meta ?= "b7125842b7ce188e7846a49fcb15a71c54806d6c"
+SRCREV_machine ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11"
+SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 18/64] nettle: upgrade 3.7.1 -> 3.7.2
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (16 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 17/64] linux-yocto/5.10: " Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 19/64] ca-certificates: Fix openssl runtime cert dependencies Anuj Mittal
` (45 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Trevor Gamblin <trevor.gamblin@windriver.com>
Version 3.7.2 includes a fix for CVE-2021-20305.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 29f0ef2e32a9b55d8271fde240a4469070d57729)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../recipes-support/nettle/{nettle_3.7.1.bb => nettle_3.7.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/nettle/{nettle_3.7.1.bb => nettle_3.7.2.bb} (96%)
diff --git a/meta/recipes-support/nettle/nettle_3.7.1.bb b/meta/recipes-support/nettle/nettle_3.7.2.bb
similarity index 96%
rename from meta/recipes-support/nettle/nettle_3.7.1.bb
rename to meta/recipes-support/nettle/nettle_3.7.2.bb
index 3bbcf17c7a..f8f3360086 100644
--- a/meta/recipes-support/nettle/nettle_3.7.1.bb
+++ b/meta/recipes-support/nettle/nettle_3.7.2.bb
@@ -24,7 +24,7 @@ SRC_URI_append_class-target = "\
file://dlopen-test.patch \
"
-SRC_URI[sha256sum] = "156621427c7b00a75ff9b34b770b95d34f80ef7a55c3407de94b16cbf436c42e"
+SRC_URI[sha256sum] = "8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162"
UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 19/64] ca-certificates: Fix openssl runtime cert dependencies
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (17 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 18/64] nettle: upgrade 3.7.1 -> 3.7.2 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 20/64] scripts/oe-debuginfod: correct several issues Anuj Mittal
` (44 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
With commit dc778c70449ee5401b5a24ad18b22b88338c47c5, dependency was
moved to openssl-bin which in itself was a fine change, but dropping
dependency on openssl too should have been kept along, dropping this
meant that openssl binary wont be able to validate secure connections as
the CApath files wont be installed, which infact are required for
openssl bins to work, following call e.g. fails
$ openssl s_client -connect google.com:443
....
New, TLSv1.3, Cipher is TLS_AES_256_GCM_SHA384
Server public key is 256 bit
Secure Renegotiation IS NOT supported
Compression: NONE
Expansion: NONE
No ALPN negotiated
Early data was not sent
Verify return code: 20 (unable to get local issuer certificate)
....
The local issuer certs are not found in default location
/usr/lib/ssh-1.1/certs, this dir and its content is installed by openssl package
therefore re-add the dependency on openssl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit eaf377315efc73d6ffe361372a873918b3bb3bf5)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../ca-certificates/ca-certificates_20210119.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb
index 888a235c1a..7dcc86fdc1 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb
@@ -83,8 +83,8 @@ do_install_append_class-native () {
SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates
}
-RDEPENDS_${PN}_class-target = "openssl-bin"
-RDEPENDS_${PN}_class-native = "openssl-native"
-RDEPENDS_${PN}_class-nativesdk = "nativesdk-openssl-bin"
+RDEPENDS_${PN}_append_class-target = " openssl-bin openssl"
+RDEPENDS_${PN}_append_class-native = " openssl-native"
+RDEPENDS_${PN}_append_class-nativesdk = " nativesdk-openssl-bin nativesdk-openssl"
BBCLASSEXTEND = "native nativesdk"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 20/64] scripts/oe-debuginfod: correct several issues
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (18 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 19/64] ca-certificates: Fix openssl runtime cert dependencies Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 21/64] oe-time-dd-test.sh: increase timeout to 15 sec Anuj Mittal
` (43 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Particularly:
- nesting subprocess.run() inside subprocess.check_output() does not work at all.
How was this tested?
- -R and -U options can be combined; no need to separate the invocations based
on packaging format
- both exception handlers are unnecessary; we can simply print the hint if
invocation did not succeed
- to run debuginfod from its own sysroot, '-c addto_recipe_sysroot' for elfutils-native
must be executed
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9e57bf636ec63e74d56f1ac48b5a27c5b80f1877)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
scripts/oe-debuginfod | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/scripts/oe-debuginfod b/scripts/oe-debuginfod
index 967dd5807c..5560769888 100755
--- a/scripts/oe-debuginfod
+++ b/scripts/oe-debuginfod
@@ -20,12 +20,7 @@ if __name__ == "__main__":
package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper()
feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True)
- try:
- if package_classes_var == "DEPLOY_DIR_RPM":
- subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', feed_dir]))
- else:
- subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-U', feed_dir]))
- except subprocess.CalledProcessError:
- print("\nTo use the debuginfod server Please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf")
- except KeyboardInterrupt:
- sys.exit(1)
+ subprocess.call(['bitbake', '-c', 'addto_recipe_sysroot', 'elfutils-native'])
+
+ subprocess.call(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', '-U', feed_dir])
+ print("\nTo use the debuginfod server please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf")
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 21/64] oe-time-dd-test.sh: increase timeout to 15 sec
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (19 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 20/64] scripts/oe-debuginfod: correct several issues Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 22/64] oeqa/runtime/cases: Only disable/enable for current boot Anuj Mittal
` (42 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Randy MacLeod <randy.macleod@windriver.com>
With the previous timeout of 5 seconds, there would be
builds such as:
https://autobuilder.yocto.io/pub/non-release/20210417-13/
which produced 17 files with top output with top running 454 times
and that's a bit too much data to analyze for each run. By
increasing the timeout, we'll find the worse problems
first, fix them and then we can decrease the timeout if needed.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 92b29a09b4c442597d212337b785afb76129ac7c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
scripts/oe-time-dd-test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/oe-time-dd-test.sh b/scripts/oe-time-dd-test.sh
index 5b25e6bd97..459071e732 100755
--- a/scripts/oe-time-dd-test.sh
+++ b/scripts/oe-time-dd-test.sh
@@ -13,7 +13,7 @@ usage() {
echo "Usage: $0 <count>"
}
-TIMEOUT=5
+TIMEOUT=15
if [ $# -ne 1 ]; then
usage
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 22/64] oeqa/runtime/cases: Only disable/enable for current boot
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (20 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 21/64] oe-time-dd-test.sh: increase timeout to 15 sec Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 23/64] python3: Upgrade 3.9.2 -> 3.9.4 Anuj Mittal
` (41 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Wes Lindauer <wesley.lindauer@gmail.com>
Previously doing a stop/start worked, but using a disable/enable does
not work on a read-only rootfs. Add a --runtime flag to systemctl so
that systemd only modifies the current boot and does not attempt to
write to the filesystem.
This also keeps the test from making a permanent (one could argue
policy) change to the running system being tested. i.e. What if the
image being tested had intentionally disabled the timesyncd service in
preference to using chrony or ntpd? The test shouldn't assume that the
user wants the timesyncd service enabled.
Signed-off-by: Wes Lindauer <wesley.lindauer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 43dd83b6a325589368c980a3f17cab90935aaeb0)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oeqa/runtime/cases/date.py | 4 ++--
meta/lib/oeqa/runtime/cases/rtc.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/date.py b/meta/lib/oeqa/runtime/cases/date.py
index fdd2a6ae58..e14322911d 100644
--- a/meta/lib/oeqa/runtime/cases/date.py
+++ b/meta/lib/oeqa/runtime/cases/date.py
@@ -13,12 +13,12 @@ class DateTest(OERuntimeTestCase):
def setUp(self):
if self.tc.td.get('VIRTUAL-RUNTIME_init_manager') == 'systemd':
self.logger.debug('Stopping systemd-timesyncd daemon')
- self.target.run('systemctl disable --now systemd-timesyncd')
+ self.target.run('systemctl disable --now --runtime systemd-timesyncd')
def tearDown(self):
if self.tc.td.get('VIRTUAL-RUNTIME_init_manager') == 'systemd':
self.logger.debug('Starting systemd-timesyncd daemon')
- self.target.run('systemctl enable --now systemd-timesyncd')
+ self.target.run('systemctl enable --now --runtime systemd-timesyncd')
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(['coreutils', 'busybox'])
diff --git a/meta/lib/oeqa/runtime/cases/rtc.py b/meta/lib/oeqa/runtime/cases/rtc.py
index a34c101a9d..c4e6681324 100644
--- a/meta/lib/oeqa/runtime/cases/rtc.py
+++ b/meta/lib/oeqa/runtime/cases/rtc.py
@@ -9,12 +9,12 @@ class RTCTest(OERuntimeTestCase):
def setUp(self):
if self.tc.td.get('VIRTUAL-RUNTIME_init_manager') == 'systemd':
self.logger.debug('Stopping systemd-timesyncd daemon')
- self.target.run('systemctl disable --now systemd-timesyncd')
+ self.target.run('systemctl disable --now --runtime systemd-timesyncd')
def tearDown(self):
if self.tc.td.get('VIRTUAL-RUNTIME_init_manager') == 'systemd':
self.logger.debug('Starting systemd-timesyncd daemon')
- self.target.run('systemctl enable --now systemd-timesyncd')
+ self.target.run('systemctl enable --now --runtime systemd-timesyncd')
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(['coreutils', 'busybox'])
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 23/64] python3: Upgrade 3.9.2 -> 3.9.4
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (21 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 22/64] oeqa/runtime/cases: Only disable/enable for current boot Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 24/64] python3: Improve logging, syntax and update deprecated modules to create_manifest Anuj Mittal
` (40 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
- Rebased patch 0001-test_locale.py-correct-the-test-output-format
Maintainer needs to sign CLA and resubmit
- configure now explicitly requires autoconf-archive to be present
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 34cb8f2a2ed36ad929dca9055c96f2f843656b8f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...le.py-correct-the-test-output-format.patch | 22 +++++++++----------
.../{python3_3.9.2.bb => python3_3.9.4.bb} | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
rename meta/recipes-devtools/python/{python3_3.9.2.bb => python3_3.9.4.bb} (99%)
diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
index 35b7e0c480..c3d1e06d00 100644
--- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
+++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
@@ -23,24 +23,24 @@ Before this patch:
Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
+
+Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
+
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
Lib/test/test_locale.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
-index e2c2178..558d63c 100644
---- a/Lib/test/test_locale.py
-+++ b/Lib/test/test_locale.py
-@@ -527,7 +527,7 @@ class TestMiscellaneous(unittest.TestCase):
+Index: Python-3.9.4/Lib/test/test_locale.py
+===================================================================
+--- Python-3.9.4.orig/Lib/test/test_locale.py
++++ Python-3.9.4/Lib/test/test_locale.py
+@@ -562,7 +562,7 @@ class TestMiscellaneous(unittest.TestCas
self.skipTest('test needs Turkish locale')
loc = locale.getlocale(locale.LC_CTYPE)
if verbose:
- print('testing with %a' % (loc,), end=' ', flush=True)
+ print('testing with %a...' % (loc,), end=' ', flush=True)
- locale.setlocale(locale.LC_CTYPE, loc)
- self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE))
-
---
-2.7.4
-
+ try:
+ locale.setlocale(locale.LC_CTYPE, loc)
+ except locale.Error as exc:
diff --git a/meta/recipes-devtools/python/python3_3.9.2.bb b/meta/recipes-devtools/python/python3_3.9.4.bb
similarity index 99%
rename from meta/recipes-devtools/python/python3_3.9.2.bb
rename to meta/recipes-devtools/python/python3_3.9.4.bb
index fd1172335a..cb371ceed7 100644
--- a/meta/recipes-devtools/python/python3_3.9.2.bb
+++ b/meta/recipes-devtools/python/python3_3.9.4.bb
@@ -38,7 +38,7 @@ SRC_URI_append_class-native = " \
file://12-distutils-prefix-is-inside-staging-area.patch \
file://0001-Don-t-search-system-for-headers-libraries.patch \
"
-SRC_URI[sha256sum] = "3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d"
+SRC_URI[sha256sum] = "4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134"
# exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -69,7 +69,7 @@ ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config
ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
-DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
+DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2 autoconf-archive-native"
DEPENDS_append_class-target = " python3-native"
DEPENDS_append_class-nativesdk = " python3-native"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 24/64] python3: Improve logging, syntax and update deprecated modules to create_manifest
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (22 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 23/64] python3: Upgrade 3.9.2 -> 3.9.4 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 25/64] systemd: Fix build on mips/musl Anuj Mittal
` (39 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
The imp module has een deprecated by upstream python, drop its usage
(imp.get_tag) in favor of sys.implementation.cache_tag.
Avoid incorrectly getting dependencies for running script and
multiprocessing module.
Improve logging behavior of the create_manifest task:
- Use indentation.
- Logs on temp directory.
- Use a proper debug flag.
- Standarize syntax.
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a3ac339f5b8549a050308ba94c4ef9093f10e303)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../python/python3/create_manifest3.py | 47 +++++++-----
.../python/python3/get_module_deps3.py | 72 +++++++++++--------
2 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py
index 4da02a2991..045240ea0b 100644
--- a/meta/recipes-devtools/python/python3/create_manifest3.py
+++ b/meta/recipes-devtools/python/python3/create_manifest3.py
@@ -36,7 +36,7 @@
# Tha method to handle cached files does not work when a module includes a folder which
# itself contains the pycache folder, gladly this is almost never the case.
#
-# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29 at gmail dot com>
+# Author: Alejandro Enedino Hernandez Samaniego <alejandro at enedino dot org>
import sys
@@ -45,6 +45,11 @@ import json
import os
import collections
+if '-d' in sys.argv:
+ debugFlag = '-d'
+else:
+ debugFlag = ''
+
# Get python version from ${PYTHON_MAJMIN}
pyversion = str(sys.argv[1])
@@ -84,6 +89,12 @@ def prepend_comments(comments, json_manifest):
manifest.seek(0, 0)
manifest.write(comments + json_contents)
+def print_indent(msg, offset):
+ for l in msg.splitlines():
+ msg = ' ' * offset + l
+ print(msg)
+
+
# Read existing JSON manifest
with open('python3-manifest.json') as manifest:
# The JSON format doesn't allow comments so we hack the call to keep the comments using a marker
@@ -99,7 +110,7 @@ with open('python3-manifest.json') as manifest:
# Not exactly the same so it should not be a function
#
-print ('Getting dependencies for package: core')
+print_indent('Getting dependencies for package: core', 0)
# This special call gets the core dependencies and
@@ -109,7 +120,7 @@ print ('Getting dependencies for package: core')
# on the new core package, they will still find them
# even when checking the old_manifest
-output = subprocess.check_output([sys.executable, 'get_module_deps3.py', 'python-core-package']).decode('utf8')
+output = subprocess.check_output([sys.executable, 'get_module_deps3.py', 'python-core-package', '%s' % debugFlag]).decode('utf8')
for coredep in output.split():
coredep = coredep.replace(pyversion,'${PYTHON_MAJMIN}')
if isCached(coredep):
@@ -149,17 +160,16 @@ for filedep in old_manifest['core']['files']:
# Get actual module name , shouldnt be affected by libdir/bindir, etc.
pymodule = os.path.splitext(os.path.basename(os.path.normpath(filedep)))[0]
-
# We now know that were dealing with a python module, so we can import it
# and check what its dependencies are.
# We launch a separate task for each module for deterministic behavior.
# Each module will only import what is necessary for it to work in specific.
# The output of each task will contain each module's dependencies
- print ('Getting dependencies for module: %s' % pymodule)
- output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule]).decode('utf8')
- print ('The following dependencies were found for module %s:\n' % pymodule)
- print (output)
+ print_indent('Getting dependencies for module: %s' % pymodule, 2)
+ output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule, '%s' % debugFlag]).decode('utf8')
+ print_indent('The following dependencies were found for module %s:\n' % pymodule, 4)
+ print_indent(output, 6)
for pymodule_dep in output.split():
@@ -178,12 +188,13 @@ for filedep in old_manifest['core']['files']:
# all others will use this a base.
+print('\n\nChecking for directories...\n')
# To improve the script speed, we check which packages contain directories
# since we will be looping through (only) those later.
for pypkg in old_manifest:
for filedep in old_manifest[pypkg]['files']:
if isFolder(filedep):
- print ('%s is a folder' % filedep)
+ print_indent('%s is a directory' % filedep, 2)
if pypkg not in hasfolders:
hasfolders.append(pypkg)
if filedep not in allfolders:
@@ -221,14 +232,14 @@ for pypkg in old_manifest:
print('\n')
print('--------------------------')
- print ('Handling package %s' % pypkg)
+ print('Handling package %s' % pypkg)
print('--------------------------')
# Handle special cases, we assume that when they were manually added
# to the manifest we knew what we were doing.
special_packages = ['misc', 'modules', 'dev', 'tests']
if pypkg in special_packages or 'staticdev' in pypkg:
- print('Passing %s package directly' % pypkg)
+ print_indent('Passing %s package directly' % pypkg, 2)
new_manifest[pypkg] = old_manifest[pypkg]
continue
@@ -259,7 +270,7 @@ for pypkg in old_manifest:
# Get actual module name , shouldnt be affected by libdir/bindir, etc.
# We need to check if the imported module comes from another (e.g. sqlite3.dump)
- path,pymodule = os.path.split(filedep)
+ path, pymodule = os.path.split(filedep)
path = os.path.basename(path)
pymodule = os.path.splitext(os.path.basename(pymodule))[0]
@@ -279,10 +290,10 @@ for pypkg in old_manifest:
# Each module will only import what is necessary for it to work in specific.
# The output of each task will contain each module's dependencies
- print ('\nGetting dependencies for module: %s' % pymodule)
- output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule]).decode('utf8')
- print ('The following dependencies were found for module %s:\n' % pymodule)
- print (output)
+ print_indent('\nGetting dependencies for module: %s' % pymodule, 2)
+ output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule, '%s' % debugFlag]).decode('utf8')
+ print_indent('The following dependencies were found for module %s:\n' % pymodule, 4)
+ print_indent(output, 6)
reportFILES = []
reportRDEPS = []
@@ -325,7 +336,7 @@ for pypkg in old_manifest:
# print('Checking folder %s on package %s' % (pymodule_dep,pypkg_with_folder))
for folder_dep in old_manifest[pypkg_with_folder]['files'] or folder_dep in old_manifest[pypkg_with_folder]['cached']:
if folder_dep == folder:
- print ('%s folder found in %s' % (folder, pypkg_with_folder))
+ print ('%s directory found in %s' % (folder, pypkg_with_folder))
folderFound = True
if pypkg_with_folder not in new_manifest[pypkg]['rdepends'] and pypkg_with_folder != pypkg:
new_manifest[pypkg]['rdepends'].append(pypkg_with_folder)
@@ -424,7 +435,7 @@ prepend_comments(comments,'python3-manifest.json.new')
if (repeated):
error_msg = '\n\nERROR:\n'
- error_msg += 'The following files are repeated (contained in more than one package),\n'
+ error_msg += 'The following files were found in more than one package),\n'
error_msg += 'this is likely to happen when new files are introduced after an upgrade,\n'
error_msg += 'please check which package should get it,\n modify the manifest accordingly and re-run the create_manifest task:\n'
error_msg += '\n'.join(repeated)
diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py b/meta/recipes-devtools/python/python3/get_module_deps3.py
index 6806f23172..1f4c982aed 100644
--- a/meta/recipes-devtools/python/python3/get_module_deps3.py
+++ b/meta/recipes-devtools/python/python3/get_module_deps3.py
@@ -3,14 +3,18 @@
# them out, the output of this execution will have all dependencies
# for a specific module, which will be parsed an dealt on create_manifest.py
#
-# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29@gmail.com>
+# Author: Alejandro Enedino Hernandez Samaniego <alejandro at enedino dot org>
-# We can get a log per module, for all the dependencies that were found, but its messy.
-debug=False
import sys
import os
+# We can get a log per module, for all the dependencies that were found, but its messy.
+if '-d' in sys.argv:
+ debug = True
+else:
+ debug = False
+
# We can get a list of the modules which are currently required to run python
# so we run python-core and get its modules, we then import what we need
# and check what modules are currently running, if we substract them from the
@@ -19,13 +23,13 @@ import os
# We use importlib to achieve this, so we also need to know what modules importlib needs
import importlib
-core_deps=set(sys.modules)
+core_deps = set(sys.modules)
def fix_path(dep_path):
import os
# We DONT want the path on our HOST system
- pivot='recipe-sysroot-native'
- dep_path=dep_path[dep_path.find(pivot)+len(pivot):]
+ pivot = 'recipe-sysroot-native'
+ dep_path = dep_path[dep_path.find(pivot)+len(pivot):]
if '/usr/bin' in dep_path:
dep_path = dep_path.replace('/usr/bin''${bindir}')
@@ -46,8 +50,8 @@ def fix_path(dep_path):
# Module to import was passed as an argument
current_module = str(sys.argv[1]).rstrip()
-if(debug==True):
- log = open('log_%s' % current_module,'w')
+if debug == True:
+ log = open('temp/log_%s' % current_module.strip('.*'),'w')
log.write('Module %s generated the following dependencies:\n' % current_module)
try:
m = importlib.import_module(current_module)
@@ -63,13 +67,13 @@ try:
except:
pass # ignore all import or other exceptions raised during import
except ImportError as e:
- if (debug==True):
- log.write('Module was not found')
+ if debug == True:
+ log.write('Module was not found\n')
pass
# Get current module dependencies, dif will contain a list of specific deps for this module
-module_deps=set(sys.modules)
+module_deps = set(sys.modules)
# We handle the core package (1st pass on create_manifest.py) as a special case
if current_module == 'python-core-package':
@@ -81,14 +85,18 @@ else:
# Check where each dependency came from
for item in dif:
- dep_path=''
+ # Main module returns script filename, __main matches mp_main__ as well
+ if 'main__' in item:
+ continue
+
+ dep_path = ''
try:
- if (debug==True):
- log.write('Calling: sys.modules[' + '%s' % item + '].__file__\n')
+ if debug == True:
+ log.write('\nCalling: sys.modules[' + '%s' % item + '].__file__\n')
dep_path = sys.modules['%s' % item].__file__
except AttributeError as e:
# Deals with thread (builtin module) not having __file__ attribute
- if debug==True:
+ if debug == True:
log.write(item + ' ')
log.write(str(e))
log.write('\n')
@@ -96,11 +104,16 @@ for item in dif:
except NameError as e:
# Deals with NameError: name 'dep_path' is not defined
# because module is not found (wasn't compiled?), e.g. bddsm
- if (debug==True):
+ if debug == True:
log.write(item+' ')
log.write(str(e))
pass
+ if dep_path == '':
+ continue
+ if debug == True:
+ log.write('Dependency path found:\n%s\n' % dep_path)
+
# Site-customize is a special case since we (OpenEmbedded) put it there manually
if 'sitecustomize' in dep_path:
dep_path = '${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py'
@@ -111,52 +124,51 @@ for item in dif:
dep_path = fix_path(dep_path)
import sysconfig
- soabi=sysconfig.get_config_var('SOABI')
+ soabi = sysconfig.get_config_var('SOABI')
# Check if its a shared library and deconstruct it
if soabi in dep_path:
- if (debug==True):
- log.write('Shared library found in %s' % dep_path)
+ if debug == True:
+ log.write('Shared library found in %s\n' % dep_path)
dep_path = dep_path.replace(soabi,'*')
print (dep_path)
continue
if "_sysconfigdata" in dep_path:
dep_path = dep_path.replace(sysconfig._get_sysconfigdata_name(), "_sysconfigdata*")
- if (debug==True):
+ if debug == True:
log.write(dep_path+'\n')
# Prints out result, which is what will be used by create_manifest
print (dep_path)
- import imp
- cpython_tag = imp.get_tag()
- cached=''
+ cpython_tag = sys.implementation.cache_tag
+ cached = ''
# Theres no naive way to find *.pyc files on python3
try:
- if (debug==True):
- log.write('Calling: sys.modules[' + '%s' % item + '].__cached__\n')
+ if debug == True:
+ log.write('\nCalling: sys.modules[' + '%s' % item + '].__cached__\n')
cached = sys.modules['%s' % item].__cached__
except AttributeError as e:
# Deals with thread (builtin module) not having __cached__ attribute
- if debug==True:
+ if debug == True:
log.write(item + ' ')
log.write(str(e))
log.write('\n')
pass
except NameError as e:
# Deals with NameError: name 'cached' is not defined
- if (debug==True):
+ if debug == True:
log.write(item+' ')
log.write(str(e))
pass
if cached is not None:
- if (debug==True):
- log.write(cached)
+ if debug == True:
+ log.write(cached + '\n')
cached = fix_path(cached)
cached = cached.replace(cpython_tag,'*')
if "_sysconfigdata" in cached:
cached = cached.replace(sysconfig._get_sysconfigdata_name(), "_sysconfigdata*")
print (cached)
-if debug==True:
+if debug == True:
log.close()
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 25/64] systemd: Fix build on mips/musl
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (23 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 24/64] python3: Improve logging, syntax and update deprecated modules to create_manifest Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 26/64] mesa: upgrade 21.0.1 -> 21.0.2 Anuj Mittal
` (38 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4a0d8799af0a3d1b685dd7200b545fdb2c79d64)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...l.h-Define-MIPS-ABI-defines-for-musl.patch | 36 +++++++++++++++++++
meta/recipes-core/systemd/systemd_247.4.bb | 1 +
2 files changed, 37 insertions(+)
create mode 100644 meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
diff --git a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
new file mode 100644
index 0000000000..bbee6e6b28
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -0,0 +1,36 @@
+From 7b32582c066549fea0f7180a6c575e7fa37a867f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 12 Apr 2021 23:44:53 -0700
+Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
+
+musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64
+unlike glibc where these are provided by libc headers, therefore define
+them here in case they are undefined
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/basic/missing_syscall.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
+index 0594a1b930..495d161334 100644
+--- a/src/basic/missing_syscall.h
++++ b/src/basic/missing_syscall.h
+@@ -15,6 +15,12 @@
+ #include <asm/sgidefs.h>
+ #endif
+
++#ifndef _MIPS_SIM_ABI32
++#define _MIPS_SIM_ABI32 1
++#define _MIPS_SIM_NABI32 2
++#define _MIPS_SIM_ABI64 3
++#endif
++
+ #if defined(__x86_64__) && defined(__ILP32__)
+ # define systemd_SC_arch_bias(x) ((x) | /* __X32_SYSCALL_BIT */ 0x40000000)
+ #elif defined(__ia64__)
+--
+2.31.1
+
diff --git a/meta/recipes-core/systemd/systemd_247.4.bb b/meta/recipes-core/systemd/systemd_247.4.bb
index cd67e65abe..32afa159ec 100644
--- a/meta/recipes-core/systemd/systemd_247.4.bb
+++ b/meta/recipes-core/systemd/systemd_247.4.bb
@@ -55,6 +55,7 @@ SRC_URI_MUSL = "\
file://0022-do-not-disable-buffer-in-writing-files.patch \
file://0025-Handle-__cpu_mask-usage.patch \
file://0026-Handle-missing-gshadow.patch \
+ file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
"
PAM_PLUGINS = " \
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 26/64] mesa: upgrade 21.0.1 -> 21.0.2
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (24 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 25/64] systemd: Fix build on mips/musl Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 27/64] go: update SRC_URI to use https protocol Anuj Mittal
` (37 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: wangmy <wangmy@fujitsu.com>
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 58ad359da1b05820ea3dc4ae3f789ccb8991fc32)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../mesa/{mesa-gl_21.0.1.bb => mesa-gl_21.0.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/mesa/{mesa-gl_21.0.1.bb => mesa-gl_21.0.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb
rename to meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index caf3c62ad8..5705ae0f08 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
"
-SRC_URI[sha256sum] = "379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb"
+SRC_URI[sha256sum] = "46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/mesa/mesa_21.0.1.bb b/meta/recipes-graphics/mesa/mesa_21.0.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.0.1.bb
rename to meta/recipes-graphics/mesa/mesa_21.0.2.bb
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 27/64] go: update SRC_URI to use https protocol
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (25 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 26/64] mesa: upgrade 21.0.1 -> 21.0.2 Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 28/64] parselogs: ignore floppy error on qemu-system-x86 at boot stage Anuj Mittal
` (36 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: wangmy <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2a1eb731ed3bcb049192550e362b771c3a9ea6eb)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/go/go-common.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index f18d928c70..39a681a712 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -14,7 +14,7 @@ LICENSE = "BSD-3-Clause"
inherit goarch
-SRC_URI = "http://golang.org/dl/go${PV}.src.tar.gz;name=main"
+SRC_URI = "https://golang.org/dl/go${PV}.src.tar.gz;name=main"
S = "${WORKDIR}/go"
B = "${S}"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 28/64] parselogs: ignore floppy error on qemu-system-x86 at boot stage
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (26 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 27/64] go: update SRC_URI to use https protocol Anuj Mittal
@ 2021-04-26 0:52 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 29/64] oeqa/runtime: space needed Anuj Mittal
` (35 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:52 UTC (permalink / raw)
To: openembedded-core
From: Yanfei Xu <yanfei.xu@windriver.com>
We can disable floppy drive by BIOS on a hardware, but an empty floppy
drive is connected by default on qemu-system-x86. Linux usually detect
the device and modprode the matched floppy.ko at the boot stage. Due to
we don't specify a floppy deivce in qemu boot arguments, then the errors
about floppy reading comes out.
It is harmless and normal, so we could ignore this error message on
qemux86.
Seen if kernel-modules is included in the image which pulls in the
relavent kernel module.
https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg01402.html
Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3359f23ee9351c70997d5e0a17d17d1e47d59623)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oeqa/runtime/cases/parselogs.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py
index 4714741aff..1bb0425521 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -88,6 +88,8 @@ qemux86_common = [
'tsc: HPET/PMTIMER calibration failed',
"modeset(0): Failed to initialize the DRI2 extension",
"glamor initialization failed",
+ "blk_update_request: I/O error, dev fd0, sector 0 op 0x0:(READ)",
+ "floppy: error",
] + common_errors
ignore_errors = {
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 29/64] oeqa/runtime: space needed
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (27 preceding siblings ...)
2021-04-26 0:52 ` [hardknott][PATCH 28/64] parselogs: ignore floppy error on qemu-system-x86 at boot stage Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 30/64] groff: not ship /usr/bin/grap2graph Anuj Mittal
` (34 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Jon Mason <jdmason@kudzu.us>
Messages are currently being printed as:
Test requires dropbear, oropenssh-sshd to be installed
but should be
Test requires dropbear, or openssh-sshd to be installed
Adding the space after the 'or' corrects this.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51596e0f8cebe1607ab64ffb018d51e815c0ee4b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oeqa/runtime/decorator/package.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py
index 57178655cc..2d7e174dbf 100644
--- a/meta/lib/oeqa/runtime/decorator/package.py
+++ b/meta/lib/oeqa/runtime/decorator/package.py
@@ -45,14 +45,14 @@ class OEHasPackage(OETestDecorator):
msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs)
self.logger.debug(msg)
if not self.case.tc.image_packages.isdisjoint(unneed_pkgs):
- msg = "Test can't run with %s installed" % ', or'.join(unneed_pkgs)
+ msg = "Test can't run with %s installed" % ', or '.join(unneed_pkgs)
self._decorator_fail(msg)
if need_pkgs:
msg = 'Checking if at least one of %s is installed' % ', '.join(need_pkgs)
self.logger.debug(msg)
if self.case.tc.image_packages.isdisjoint(need_pkgs):
- msg = "Test requires %s to be installed" % ', or'.join(need_pkgs)
+ msg = "Test requires %s to be installed" % ', or '.join(need_pkgs)
self._decorator_fail(msg)
def _decorator_fail(self, msg):
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 30/64] groff: not ship /usr/bin/grap2graph
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (28 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 29/64] oeqa/runtime: space needed Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 31/64] sanity: Add error check for '%' in build path Anuj Mittal
` (33 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
grap2graph which converts a GRAP diagram into a cropped image fails
to run as below:
$ grap2graph
/usr/bin/grap2graph: line 89: convert: command not found
/usr/bin/grap2graph: warning: falling back to old '-crop 0x0' trim method
/usr/bin/grap2graph: line 104: convert: command not found
/usr/bin/grap2graph: line 103: grap: command not found
Considering we don't often need to convert a GRAP diagram into
a cropped image and the recipe ImageMagick which provides convert
command is in meta-oe layer, so don't ship the related files to
avoid the confusion about the above run time error.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 251be7279a475ee18c0c53fe9795bb37bffc2b45)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-extended/groff/groff_1.22.4.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb
index 983cb9aea6..f0e9eb6a8a 100644
--- a/meta/recipes-extended/groff/groff_1.22.4.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -62,6 +62,10 @@ do_install_append() {
rm -rf ${D}${bindir}/glilypond
rm -rf ${D}${libdir}/groff/glilypond
rm -rf ${D}${mandir}/man1/glilypond*
+
+ # not ship /usr/bin/grap2graph and its releated man files
+ rm -rf ${D}${bindir}/grap2graph
+ rm -rf ${D}${mandir}/man1/grap2graph*
}
do_install_append_class-native() {
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 31/64] sanity: Add error check for '%' in build path
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (29 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 30/64] groff: not ship /usr/bin/grap2graph Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 32/64] insane: clean up some more warning messages Anuj Mittal
` (32 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
It has been reported that '%' characters in build paths break with python
exceptions, probably due to confusion with python string escaping. Whilst it
is probably fixable, showing the user a human readable error is better given
it doesn't work.
[YOCTO #14282]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 31a3cf78452270131a657be45e76569515cff7ef)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/sanity.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 894f0e3107..14ffac0bf2 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -887,6 +887,8 @@ def check_sanity_everybuild(status, d):
status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include any + characters.")
if oeroot.find('@') != -1:
status.addresult("Error, you have an invalid character (@) in your COREBASE directory path. Please move the installation to a directory which doesn't include any @ characters.")
+ if oeroot.find('%') != -1:
+ status.addresult("Error, you have an invalid character (%) in your COREBASE directory path which causes problems with python string formatting. Please move the installation to a directory which doesn't include any % characters.")
if oeroot.find(' ') != -1:
status.addresult("Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space since autotools doesn't support this.")
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 32/64] insane: clean up some more warning messages
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (30 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 31/64] sanity: Add error check for '%' in build path Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 33/64] systemd: upgrade 247.4 -> 247.6 Anuj Mittal
` (31 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross@burtonini.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2abe18682192e7b38b9af5a5043906f2f069648f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/insane.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index fa05fc055b..763d5f1da2 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -176,7 +176,7 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
# The dynamic linker searches both these places anyway. There is no point in
# looking there again.
- package_qa_add_message(messages, "useless-rpaths", "%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
+ package_qa_add_message(messages, "useless-rpaths", "%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d, name), rpath))
QAPATHTEST[dev-so] = "package_qa_check_dev"
def package_qa_check_dev(path, name, d, elf, messages):
@@ -185,8 +185,8 @@ def package_qa_check_dev(path, name, d, elf, messages):
"""
if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-ptest") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path):
- package_qa_add_message(messages, "dev-so", "non -dev/-dbg/nativesdk- package contains symlink .so: %s path '%s'" % \
- (name, package_qa_clean_path(path,d)))
+ package_qa_add_message(messages, "dev-so", "non -dev/-dbg/nativesdk- package %s contains symlink .so '%s'" % \
+ (name, package_qa_clean_path(path, d, name)))
QAPATHTEST[dev-elf] = "package_qa_check_dev_elf"
def package_qa_check_dev_elf(path, name, d, elf, messages):
@@ -196,8 +196,8 @@ def package_qa_check_dev_elf(path, name, d, elf, messages):
install link-time .so files that are linker scripts.
"""
if name.endswith("-dev") and path.endswith(".so") and not os.path.islink(path) and elf:
- package_qa_add_message(messages, "dev-elf", "-dev package contains non-symlink .so: %s path '%s'" % \
- (name, package_qa_clean_path(path,d)))
+ package_qa_add_message(messages, "dev-elf", "-dev package %s contains non-symlink .so '%s'" % \
+ (name, package_qa_clean_path(path, d, name)))
QAPATHTEST[staticdev] = "package_qa_check_staticdev"
def package_qa_check_staticdev(path, name, d, elf, messages):
@@ -210,7 +210,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages):
if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path:
package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \
- (name, package_qa_clean_path(path,d)))
+ (name, package_qa_clean_path(path,d, name)))
QAPATHTEST[mime] = "package_qa_check_mime"
def package_qa_check_mime(path, name, d, elf, messages):
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 33/64] systemd: upgrade 247.4 -> 247.6
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (31 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 32/64] insane: clean up some more warning messages Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 34/64] modutils-initscripts: Bail out when no module is installed Anuj Mittal
` (30 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Anthony Bagwell <aj.bagwell@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 63fbf39b8aa3d94ca2db719d1a53190045dbb86d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../systemd/{systemd-boot_247.4.bb => systemd-boot_247.6.bb} | 0
.../systemd/{systemd-conf_247.3.bb => systemd-conf_247.6.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
.../recipes-core/systemd/{systemd_247.4.bb => systemd_247.6.bb} | 0
4 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/systemd/{systemd-boot_247.4.bb => systemd-boot_247.6.bb} (100%)
rename meta/recipes-core/systemd/{systemd-conf_247.3.bb => systemd-conf_247.6.bb} (100%)
rename meta/recipes-core/systemd/{systemd_247.4.bb => systemd_247.6.bb} (100%)
diff --git a/meta/recipes-core/systemd/systemd-boot_247.4.bb b/meta/recipes-core/systemd/systemd-boot_247.6.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_247.4.bb
rename to meta/recipes-core/systemd/systemd-boot_247.6.bb
diff --git a/meta/recipes-core/systemd/systemd-conf_247.3.bb b/meta/recipes-core/systemd/systemd-conf_247.6.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-conf_247.3.bb
rename to meta/recipes-core/systemd/systemd-conf_247.6.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 098bca98f1..7d3b3064ba 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRCREV = "069525e84a67375e27429cb490e8d28af78e673a"
+SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5"
SRCBRANCH = "v247-stable"
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
diff --git a/meta/recipes-core/systemd/systemd_247.4.bb b/meta/recipes-core/systemd/systemd_247.6.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd_247.4.bb
rename to meta/recipes-core/systemd/systemd_247.6.bb
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 34/64] modutils-initscripts: Bail out when no module is installed
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (32 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 33/64] systemd: upgrade 247.4 -> 247.6 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 35/64] sysvinit-inittab/start_getty: Check /sys for the tty device existence Anuj Mittal
` (29 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Kevin Hao <kexin.hao@windriver.com>
Fix the following warning when boot with a core-image-minimal rootfs:
depmod: can't change directory to 'lib/modules/5.10.25-yocto-standard': No such file or directory
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c34650400182a1104a5fbe03e54f5cea69eb1900)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/modutils-initscripts/files/modutils.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
index 28fe6f92d7..67e1dcd990 100755
--- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
+++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
@@ -13,6 +13,7 @@
LOAD_MODULE=modprobe
[ -f /proc/modules ] || exit 0
+[ -d /lib/modules/`uname -r` ] || exit 0
# Test if modules.dep exists and has a size greater than zero
if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 35/64] sysvinit-inittab/start_getty: Check /sys for the tty device existence
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (33 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 34/64] modutils-initscripts: Bail out when no module is installed Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 36/64] Revert "inittab: Add getty launch on hvc0 for qemuppc64" Anuj Mittal
` (28 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Kevin Hao <kexin.hao@windriver.com>
The hvc tty driver doesn't populate a file like /proc/tty/driver/serial,
so the current implementation of start_getty doesn't work for the hvc
console. By checking the /sys/class/tty/ for the tty device existence,
it should support more console types and also make the codes more simple.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 670ceef0f6584ece5ce4176610255226a6148570)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../sysvinit/sysvinit-inittab/start_getty | 44 ++-----------------
1 file changed, 3 insertions(+), 41 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
index dfa799adac..699a1ead1a 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
@@ -1,17 +1,4 @@
#!/bin/sh
-###############################################################################
-# This script is used to automatically set up the serial console(s) on startup.
-# The variable SERIAL_CONSOLES can be set in meta/conf/machine/*.conf.
-# Script enhancement has been done based on Bug YOCTO #10844.
-# Most of the information is retrieved from /proc virtual filesystem containing
-# all the runtime system information (eg. system memory, device mount, etc).
-###############################################################################
-
-# Get active serial filename.
-active_serial=$(grep "serial" /proc/tty/drivers | cut -d/ -f1 | sed "s/ *$//")
-
-# Rephrase input parameter from ttyS target index (ttyS1, ttyS2, ttyAMA0, etc).
-runtime_tty=$(echo $2 | grep -oh '[0-9]\+')
# busybox' getty does this itself, util-linux' agetty needs extra help
getty="/sbin/getty"
@@ -25,31 +12,6 @@ case $(readlink -f "${getty}") in
;;
esac
-# Backup $IFS.
-DEFAULT_IFS=$IFS
-# Customize Internal Field Separator.
-IFS="$(printf '\n\t')"
-
-for line in $active_serial; do
- # Check we have the file containing current active serial target index.
- if [ -e "/proc/tty/driver/$line" ]
- then
- # Remove all unknown entries and discard the first line (desc).
- activetty=$(grep -v "unknown" "/proc/tty/driver/$line" \
- | tail -n +2 | grep -oh "^\s*\S*[0-9]\+")
- for active in $activetty; do
- # If indexes do match then enable the serial console.
- if [ $active -eq $runtime_tty ]
- then
- if [ -c /dev/$2 ]
- then
- ${setsid:-} ${getty} -L $1 $2 $3
- fi
- break
- fi
- done
- fi
-done
-
-# Restore $IFS.
-IFS=$DEFAULT_IFS
+if [ -e /sys/class/tty/$2 -a -c /dev/$2 ]; then
+ ${setsid:-} ${getty} -L $1 $2 $3
+fi
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 36/64] Revert "inittab: Add getty launch on hvc0 for qemuppc64"
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (34 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 35/64] sysvinit-inittab/start_getty: Check /sys for the tty device existence Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 37/64] libtool: make sure autoheader run before automake Anuj Mittal
` (27 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Kevin Hao <kexin.hao@windriver.com>
This reverts commit ed69ef20167da0986bc9363d1a91e62001995af4.
The console entry has already been added into /etc/inittab based
on the SERIAL_CONSOLES. So drop this redundant entry.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 633f0c6b74e3caa2bae52ca60c61b811b7b2215d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-core/busybox/busybox-inittab_1.33.0.bb | 3 ---
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 4 ----
2 files changed, 7 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb
index 0021e45511..3804f4f7b2 100644
--- a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb
+++ b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb
@@ -44,9 +44,6 @@ EOF
fi
}
-do_install_append_qemuppc64 () {
- echo "9:12345:respawn:${base_sbindir}/getty 38400 hvc0" >> ${D}${sysconfdir}/inittab
-}
pkg_postinst_${PN} () {
# run this on host and on target
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 0af116f35c..d95d1a63f5 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -53,10 +53,6 @@ EOF
fi
}
-do_install_append_qemuppc64 () {
- echo "9:12345:respawn:${base_sbindir}/getty 38400 hvc0" >> ${D}${sysconfdir}/inittab
-}
-
pkg_postinst_${PN} () {
# run this on host and on target
if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 37/64] libtool: make sure autoheader run before automake
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (35 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 36/64] Revert "inittab: Add getty launch on hvc0 for qemuppc64" Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 38/64] kmod: do not symlink config.guess/config.sub during autoreconf Anuj Mittal
` (26 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
When use automake to generate Makefile.in from Makefile.am, there
comes below race:
| configure.ac:45: error: required file 'config-h.in' not found
It is because the file config-h.in in updating process by autoheader,
so make automake run after autoheader to avoid the above race.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1fc0a4a98e65db7efba8bb5cb835101ea5dd865b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../libtool/libtool-2.4.6.inc | 1 +
| 35 +++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index 19a03d4733..e9225e140c 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://0001-libtool-Fix-support-for-NIOS2-processor.patch \
file://0001-libtool-Check-for-static-libs-for-internal-compiler-.patch \
file://0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \
+ file://0001-Makefile.am-make-sure-autoheader-run-before-automake.patch \
"
SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
--git a/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch
new file mode 100644
index 0000000000..87f8492346
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-automake.patch
@@ -0,0 +1,35 @@
+From e82c06584f02e3e4487aa73aa05981e2a35dc6d1 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Tue, 13 Apr 2021 07:17:29 +0000
+Subject: [PATCH] Makefile.am: make sure autoheader run before automake
+
+When use automake to generate Makefile.in from Makefile.am, there
+comes below race:
+ | configure.ac:45: error: required file 'config-h.in' not found
+
+It is because the file config-h.in in updating process by autoheader,
+so make automake run after autoheader to avoid the above race.
+
+Upstream-Status: Submitted [libtool-patches@gnu.org maillist]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2752ecc..29950db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -328,7 +328,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \
+ $(lt_obsolete_m4) \
+ $(stamp_mk)
+
+-$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
++$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in)
+ $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile
+
+ # Don't let unused scripts leak into the libltdl Makefile
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 38/64] kmod: do not symlink config.guess/config.sub during autoreconf
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (36 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 37/64] libtool: make sure autoheader run before automake Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 39/64] pango: re-enable ptest Anuj Mittal
` (25 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Gavin Li <gavin@matician.com>
I was encountering the following race condition on poky:
- automake-native does do_install.
- automake-native does do_populate_sysroot. This hardlinks config.guess
and config.sub into ${D}.
- kmod-native does do_configure. This runs `autoreconf`, which runs
`automake --add-missing` (symlinks config.guess/config.sub from
recipe-sysroot-native to build dir), then runs `gnu-configize` (copies
_its own_ config.guess/config.sub _on top_ of the already existing
ones). Since the destinations already had symlinks, the copy would
overwrite config.guess/config.sub in recipe-sysroot-native, which
would in turn overwrite the same in ${D} due to being hardlinked.
- automake-native does do_package. The outhash is thus calculated on the
clobbered config.guess/config.sub files.
With hash equivalency enabled, the different outhash produced a
different unihash, which kept me from reusing sstate between my laptop
and my build server. This race condition would happen only on the build
server (BB_NUMBER_THREADS = 32) but never on my laptop
(BB_NUMBER_THREADS = 6).
I didn't see the --install and --symlink flags being used by any other
recipe, so I removed them, and that fixed the issue.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 89d675efd633b495daa4a3a57420b9c309497035)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/kmod/kmod.inc | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index ccda9f2b73..ba5ec7f650 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -26,7 +26,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
S = "${WORKDIR}/git"
-EXTRA_AUTORECONF += "--install --symlink"
EXTRA_OECONF +=" --enable-tools --with-zlib"
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 39/64] pango: re-enable ptest
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (37 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 38/64] kmod: do not symlink config.guess/config.sub during autoreconf Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 40/64] go: upgrade 1.16.2 -> 1.16.3 Anuj Mittal
` (24 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Saul Wold <Saul.Wold@windriver.com>
The run-ptest script got accidently dropped from the SRC_URI during
a past update and ptest patch.
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4479f810c1a3ab2badf4f9610c309bc0e23e2a5f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-graphics/pango/pango_1.48.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/pango/pango_1.48.2.bb b/meta/recipes-graphics/pango/pango_1.48.2.bb
index 1dcb43b5e1..aa279bb503 100644
--- a/meta/recipes-graphics/pango/pango_1.48.2.bb
+++ b/meta/recipes-graphics/pango/pango_1.48.2.bb
@@ -18,6 +18,8 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec
GIR_MESON_ENABLE_FLAG = "enabled"
GIR_MESON_DISABLE_FLAG = "disabled"
+SRC_URI += "file://run-ptest"
+
SRC_URI[archive.sha256sum] = "d21f8b30dc8abdfc55de25656ecb88dc1105eeeb315e5e2a980dcef8010c2c80"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 40/64] go: upgrade 1.16.2 -> 1.16.3
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (38 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 39/64] pango: re-enable ptest Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 41/64] glslang: strip whitespace in pkgconfig file Anuj Mittal
` (23 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: wangmy <wangmy@fujitsu.com>
This is bugfix release in 1.16 series [1]
[1] https://github.com/golang/go/issues?q=milestone%3AGo1.16.3+label%3ACherryPickApproved
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 84188e7b78aa40b168b526fa5d681a8a21d3b77c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} | 4 ++--
...{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} | 4 ++--
...o-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} | 0
.../go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} | 0
.../go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} | 0
.../go/{go-native_1.16.2.bb => go-native_1.16.3.bb} | 0
.../go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} | 0
meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} | 0
8 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} (88%)
rename meta/recipes-devtools/go/{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.16.2.bb => go-native_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} (100%)
rename meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.16.2.inc b/meta/recipes-devtools/go/go-1.16.3.inc
similarity index 88%
rename from meta/recipes-devtools/go/go-1.16.2.inc
rename to meta/recipes-devtools/go/go-1.16.3.inc
index e65caf8197..ebd25a5eaa 100644
--- a/meta/recipes-devtools/go/go-1.16.2.inc
+++ b/meta/recipes-devtools/go/go-1.16.3.inc
@@ -1,7 +1,7 @@
require go-common.inc
GO_BASEVERSION = "1.16"
-PV = "1.16.2"
+PV = "1.16.3"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -17,4 +17,4 @@ SRC_URI += "\
file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
"
-SRC_URI[main.sha256sum] = "37ca14287a23cb8ba2ac3f5c3dd8adbc1f7a54b9701a57824bf19a0b271f83ea"
+SRC_URI[main.sha256sum] = "b298d29de9236ca47a023e382313bcc2d2eed31dfa706b60a04103ce83a71a25"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.16.2.bb b/meta/recipes-devtools/go/go-binary-native_1.16.3.bb
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.16.2.bb
rename to meta/recipes-devtools/go/go-binary-native_1.16.3.bb
index 4fb060173c..d01a2bd8f1 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.16.2.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.16.3.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
PROVIDES = "go-native"
SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8"
-SRC_URI[go_linux_arm64.sha256sum] = "6924601d998a0917694fd14261347e3798bd2ad6b13c4d7f2edd70c9d57f62ab"
+SRC_URI[go_linux_amd64.sha256sum] = "951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2"
+SRC_URI[go_linux_arm64.sha256sum] = "566b1d6f17d2bc4ad5f81486f0df44f3088c3ed47a3bec4099d8ed9939e90d5d"
UPSTREAM_CHECK_URI = "https://golang.org/dl/"
UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb b/meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.16.2.bb b/meta/recipes-devtools/go/go-cross_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.16.2.bb
rename to meta/recipes-devtools/go/go-cross_1.16.3.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.16.2.bb b/meta/recipes-devtools/go/go-crosssdk_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.16.2.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.16.3.bb
diff --git a/meta/recipes-devtools/go/go-native_1.16.2.bb b/meta/recipes-devtools/go/go-native_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.16.2.bb
rename to meta/recipes-devtools/go/go-native_1.16.3.bb
diff --git a/meta/recipes-devtools/go/go-runtime_1.16.2.bb b/meta/recipes-devtools/go/go-runtime_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.16.2.bb
rename to meta/recipes-devtools/go/go-runtime_1.16.3.bb
diff --git a/meta/recipes-devtools/go/go_1.16.2.bb b/meta/recipes-devtools/go/go_1.16.3.bb
similarity index 100%
rename from meta/recipes-devtools/go/go_1.16.2.bb
rename to meta/recipes-devtools/go/go_1.16.3.bb
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 41/64] glslang: strip whitespace in pkgconfig file
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (39 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 40/64] go: upgrade 1.16.2 -> 1.16.3 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 42/64] ltp: fix empty ltp-dev package Anuj Mittal
` (22 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross@burtonini.com>
Whilst pkg-config is fine with .pc files containing leading whitespace,
pkgconf is less forgiving.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 14bfe5f15f78c1bc049868633fd6fa19feb5a70c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../0001-generate-glslang-pkg-config.patch | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
index ef092f17a1..cddd330971 100644
--- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -34,14 +34,14 @@ index 00000000..64b6882d
--- /dev/null
+++ b/glslang/glslang.pc.cmake.in
@@ -0,0 +1,11 @@
-+ prefix=@CMAKE_INSTALL_PREFIX@
-+ exec_prefix=@CMAKE_INSTALL_PREFIX@
-+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+
-+ Name: @PROJECT_NAME@
-+ Description: OpenGL and OpenGL ES shader front end and validator
-+ Requires:
-+ Version: @GLSLANG_VERSION@
-+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
-+ Cflags: -I${includedir}
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++
++Name: @PROJECT_NAME@
++Description: OpenGL and OpenGL ES shader front end and validator
++Requires:
++Version: @GLSLANG_VERSION@
++Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
++Cflags: -I${includedir}
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 42/64] ltp: fix empty ltp-dev package
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (40 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 41/64] glslang: strip whitespace in pkgconfig file Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 43/64] packagegroup-core-tools-profile: Remove valgrind for riscv32 Anuj Mittal
` (21 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Jonas Höppner <jonas.hoeppner@garz-fricke.com>
Currently the headers are not installed and the ltp-dev package is
empty.
This patch adds an include-install make target in the do_install step to
install them in sysroot which ends up as a working ltp-dev package.
Signed-off-by: Jonas Höppner <jonas.hoeppner@garz-fricke.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f6943da4444cd71053650be0c9212bc25ac53137)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-extended/ltp/ltp_20210121.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/ltp/ltp_20210121.bb b/meta/recipes-extended/ltp/ltp_20210121.bb
index f58ca2eb2c..d98c9fdc25 100644
--- a/meta/recipes-extended/ltp/ltp_20210121.bb
+++ b/meta/recipes-extended/ltp/ltp_20210121.bb
@@ -61,7 +61,7 @@ EXTRA_OECONF += " --without-tirpc "
do_install(){
install -d ${D}${prefix}/
- oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
+ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install include-install
# fixup not deploy STPfailure_report.pl to avoid confusing about it fails to run
# as it lacks dependency on some perl moudle such as LWP::Simple
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 43/64] packagegroup-core-tools-profile: Remove valgrind for riscv32
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (41 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 42/64] ltp: fix empty ltp-dev package Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 44/64] packagegroup-core-tools-testapps.bb: Remove kexec " Anuj Mittal
` (20 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
valgrind is not yet ported to riscv32.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit df70bc4c60838af1dd7e7f31aba43e8d190def77)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../packagegroups/packagegroup-core-tools-profile.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index b8e2c718e6..194dca76d0 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -57,6 +57,7 @@ VALGRIND_armv6 = ""
VALGRIND_armeb = ""
VALGRIND_aarch64 = ""
VALGRIND_riscv64 = ""
+VALGRIND_riscv32 = ""
VALGRIND_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}"
VALGRIND_linux-gnux32 = ""
VALGRIND_linux-gnun32 = ""
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 44/64] packagegroup-core-tools-testapps.bb: Remove kexec for riscv32
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (42 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 43/64] packagegroup-core-tools-profile: Remove valgrind for riscv32 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 45/64] libxshmfence: Build fixes " Anuj Mittal
` (19 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
kexec is not yet ported to riscv32.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f1e7da7737b3d6df27cc5af002fd1eb0c202d0b4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../packagegroups/packagegroup-core-tools-testapps.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index a5fc152859..015810cb6b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -16,6 +16,7 @@ KEXECTOOLS_e5500-64b ?= ""
KEXECTOOLS_microblaze ?= ""
KEXECTOOLS_nios2 ?= ""
KEXECTOOLS_riscv64 ?= ""
+KEXECTOOLS_riscv32 ?= ""
GSTEXAMPLES ?= "gst-examples"
GSTEXAMPLES_riscv64 = ""
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 45/64] libxshmfence: Build fixes for riscv32
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (43 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 44/64] packagegroup-core-tools-testapps.bb: Remove kexec " Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 46/64] arch-armv6m.inc: fix access rights Anuj Mittal
` (18 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
NR_futex is not defined by newer architectures e.g. riscv32 as
they only have 64bit variant of time_t. Glibc defines SYS_futex
interface based on __NR_futex, since this is used in applications,
such applications start to fail to build for these newer architectures.
Define a fallback to alias __NR_futex to __NR_futex_time64 to make
SYS_futex keep working.
Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 81599bf32135187b34726d41e9f619d22ca1bdd1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++++++++++++++++++
.../xorg-lib/libxshmfence_1.3.bb | 4 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch
new file mode 100644
index 0000000000..3e87794d20
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch
@@ -0,0 +1,39 @@
+From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 7 Apr 2021 07:48:42 +0000
+Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist
+
+_NR_futex is not defines by newer architectures e.g. riscv32 as
+they only have 64bit variant of time_t. Glibc defines SYS_futex
+interface based on __NR_futex, since this is used in applications,
+such applications start to fail to build for these newer architectures.
+This patch defines a fallback to alias __NR_futex to __NR_futex_time64
+to make SYS_futex keep working.
+
+Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/xshmfence_futex.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h
+index 673ac0e..a71efa5 100644
+--- a/src/xshmfence_futex.h
++++ b/src/xshmfence_futex.h
+@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) {
+ #include <sys/time.h>
+ #include <sys/syscall.h>
+
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++#define SYS_futex SYS_futex_time64
++#endif
++
+ static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3)
+ {
+ return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
+--
+2.29.2
+
diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb
index cc45696530..d153c7a603 100644
--- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb
@@ -13,7 +13,9 @@ DEPENDS += "virtual/libx11"
EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm"
-BBCLASSEXTEND = "native nativesdk"
+SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch"
SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937"
SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 46/64] arch-armv6m.inc: fix access rights
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (44 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 45/64] libxshmfence: Build fixes " Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 47/64] Revert "externalsrc: Detect code changes in submodules" Anuj Mittal
` (17 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2f7ebe444c2a78ef149b8c5f0f005ab23f24a176)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/conf/machine/include/arm/arch-armv6m.inc | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 meta/conf/machine/include/arm/arch-armv6m.inc
diff --git a/meta/conf/machine/include/arm/arch-armv6m.inc b/meta/conf/machine/include/arm/arch-armv6m.inc
old mode 100755
new mode 100644
--
2.30.2
^ permalink raw reply [flat|nested] 65+ messages in thread
* [hardknott][PATCH 47/64] Revert "externalsrc: Detect code changes in submodules"
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (45 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 46/64] arch-armv6m.inc: fix access rights Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 48/64] externalsrc: Detect code changes in submodules Anuj Mittal
` (16 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Douglas Royds <douglas.royds@taitradio.com>
This reverts commit 4525310d49d115a37705f04ac5c03d639e5e8f8c.
Further to 50ff9afb39, only detect code changes in submodules that are
subdirectories of the EXTERNALSRC directory.
The (undocumented) git submodule--helper returns a path
for each submodule relative to the top of the repo.
Don't add submodules that are not within our EXTERNALSRC subtree.
If we unpack one git repo inside another, like this:
SRC_URI = "git://${GIT_SERVER}/repo1;name=repo1;destsuffix=repo1 \
git://${GIT_SERVER}/repo2;name=repo2;destsuffix=repo1/repo2 \
"
Git status reports, for repo1:
Untracked files:
(use "git add <file>..." to include in what will be committed)
repo2/
If we run `devtool modify` on this recipe, do_patch runs with:
PATCHTOOL = "git"
PATCH_COMMIT_FUNCTIONS = "1"
The `patch_task_postfunc` (patch.bbclass, line 82) runs a `git add .` on the
top-level repo1, leaving the checkout in an invalid state. The following git
warning does not appear in the log:
$ git add .
warning: adding embedded git repository: repo2
hint: You've added another git repository inside your current repository.
hint: Clones of the outer repository will not contain the contents of
hint: the embedded repository and will not know how to obtain it.
hint: If you meant to add a submodule, use:
hint:
hint: git submodule add <url> repo2
hint:
hint: If you added this path by mistake, you can remove it from the
hint: index with:
hint:
hint: git rm --cached repo2
hint:
hint: See "git help submodule" for more information.
$ git submodule status
fatal: no submodule mapping found in .gitmodules for path 'repo2'
No further git submodule commands can be run on the checkout.
We could enhance the `patch_task_postfunc` to look for any embedded git
checkouts and add them as submodules, but this seems unnecessary complexity for
an obscure edge-case. Although the git repo is left in an invalid state with
respect to the submodules, it still serves the purpose required by devtool:
To take further commits, and generate patch files from them.
We are still able to run these commands to examine any submodules,
where git submodule--helper reports paths relative to the top of the checkout:
$ git ls-files --stage | grep ^160000
160000 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2
$ git submodule--helper list
160000 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2
When a recipe sets EXTERNALSRC to a subdirectory of the git checkout, we test
for the existence of the reported submodule paths within the EXTERNALSRC
directory.
The latest versions of git submodule--helper accept a path to a subdirectory and
correctly report no submodules within that subdirectory. Regrettably, we still
support git versions that don't accept a path to a subdirectory.
[YOCTO #14333]
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2055718fdd19f925e236d67823017323bbd92a4b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/externalsrc.bbclass | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 54cc7edbae..c7b2bf2f49 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -217,16 +217,14 @@ def srctree_hash_files(d, srcdir=None):
env['GIT_INDEX_FILE'] = tmp_index.name
subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env)
git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8")
- submodule_helper = subprocess.check_output(['git', 'submodule', 'status'], cwd=s_dir, env=env).decode("utf-8")
+ submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8")
for line in submodule_helper.splitlines():
- module_relpath = line.split()[1]
- if not module_relpath.split('/')[0] == '..':
- module_dir = os.path.join(s_dir, module_relpath)
- proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
- proc.communicate()
- proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
- stdout, _ = proc.communicate()
- git_sha1 += stdout.decode("utf-8")
+ module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
+ proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+ proc.communicate()
+ proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+ stdout, _ = proc.communicate()
+ git_sha1 += stdout.decode("utf-8")
sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest()
with open(oe_hash_file, 'w') as fobj:
fobj.write(sha1)
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 48/64] externalsrc: Detect code changes in submodules
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (46 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 47/64] Revert "externalsrc: Detect code changes in submodules" Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 49/64] deb: apply postinstall on sdk Anuj Mittal
` (15 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Douglas Royds <douglas.royds@taitradio.com>
Further to 50ff9afb39, only detect code changes in submodules that are
subdirectories of the EXTERNALSRC directory.
The (undocumented) git submodule--helper returns a path
for each submodule relative to the top of the repo.
Don't add submodules that are not within our source subtree.
[YOCTO #14333]
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1c18225d3ef94a41fc073ae87c163b68e6d46571)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/externalsrc.bbclass | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index c7b2bf2f49..3d6b80bee2 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -220,11 +220,12 @@ def srctree_hash_files(d, srcdir=None):
submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8")
for line in submodule_helper.splitlines():
module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
- proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
- proc.communicate()
- proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
- stdout, _ = proc.communicate()
- git_sha1 += stdout.decode("utf-8")
+ if os.path.isdir(module_dir):
+ proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+ proc.communicate()
+ proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+ stdout, _ = proc.communicate()
+ git_sha1 += stdout.decode("utf-8")
sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest()
with open(oe_hash_file, 'w') as fobj:
fobj.write(sha1)
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 49/64] deb: apply postinstall on sdk
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (47 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 48/64] externalsrc: Detect code changes in submodules Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 50/64] wpa-supplicant: fix CVE-2021-30004 Anuj Mittal
` (14 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: hongxu <hongxu.jia@windriver.com>
If not postinstall applied, some nativesdk command could not be found
in sdk due to update-alternatives in postinst not be executed, such as chroot:
$ which chroot
/sbin/chroot
$ which chroot.coreutils
path-to-sdk/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/chroot.coreutils
After applying the fix
$ which chroot
path-to-sdk/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/chroot
$ which chroot.coreutils
path-to-sdk/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/chroot.coreutils
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2a9bf19502766baa4087456649d5471483d04f6a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/lib/oe/package_manager/deb/sdk.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py
index 9859d8f32d..f4b0b6510a 100644
--- a/meta/lib/oe/package_manager/deb/sdk.py
+++ b/meta/lib/oe/package_manager/deb/sdk.py
@@ -65,6 +65,8 @@ class PkgSdk(Sdk):
self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY'))
+ self.target_pm.run_pre_post_installs()
+
self.target_pm.run_intercepts(populate_sdk='target')
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND"))
@@ -78,6 +80,8 @@ class PkgSdk(Sdk):
self._populate_sysroot(self.host_pm, self.host_manifest)
self.install_locales(self.host_pm)
+ self.host_pm.run_pre_post_installs()
+
self.host_pm.run_intercepts(populate_sdk='host')
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND"))
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 50/64] wpa-supplicant: fix CVE-2021-30004
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (48 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 49/64] deb: apply postinstall on sdk Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 51/64] lttng-tools: Fix missing legacy test files Anuj Mittal
` (13 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Stefan Ghinea <stefan.ghinea@windriver.com>
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.
References:
https://nvd.nist.gov/vuln/detail/CVE-2021-30004
Upstream patches:
https://w1.fi/cgit/hostap/commit/?id=a0541334a6394f8237a4393b7372693cd7e96f15
Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b32b671bf430b36a5547f8d822dbb760d6be47f7)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../wpa-supplicant/CVE-2021-30004.patch | 123 ++++++++++++++++++
.../wpa-supplicant/wpa-supplicant_2.9.bb | 1 +
2 files changed, 124 insertions(+)
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
new file mode 100644
index 0000000000..e2540fc26b
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-30004.patch
@@ -0,0 +1,123 @@
+From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Sat, 13 Mar 2021 18:19:31 +0200
+Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters
+
+The supported hash algorithms do not use AlgorithmIdentifier parameters.
+However, there are implementations that include NULL parameters in
+addition to ones that omit the parameters. Previous implementation did
+not check the parameters value at all which supported both these cases,
+but did not reject any other unexpected information.
+
+Use strict validation of digest algorithm parameters and reject any
+unexpected value when validating a signature. This is needed to prevent
+potential forging attacks.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+
+Upstream-Status: Backport
+CVE: CVE-2021-30004
+
+Reference to upstream patch:
+[https://w1.fi/cgit/hostap/commit/?id=a0541334a6394f8237a4393b7372693cd7e96f15]
+
+Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
+---
+ src/tls/pkcs1.c | 21 +++++++++++++++++++++
+ src/tls/x509v3.c | 20 ++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
+index 141ac50..e09db07 100644
+--- a/src/tls/pkcs1.c
++++ b/src/tls/pkcs1.c
+@@ -240,6 +240,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ os_free(decrypted);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo",
++ hdr.payload, hdr.length);
+
+ pos = hdr.payload;
+ end = pos + hdr.length;
+@@ -261,6 +263,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ os_free(decrypted);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier",
++ hdr.payload, hdr.length);
+ da_end = hdr.payload + hdr.length;
+
+ if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
+@@ -269,6 +273,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ os_free(decrypted);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters",
++ next, da_end - next);
++
++ /*
++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++ * omit the parameters, but there are implementation that encode these
++ * as a NULL element. Allow these two cases and reject anything else.
++ */
++ if (da_end > next &&
++ (asn1_get_next(next, da_end - next, &hdr) < 0 ||
++ !asn1_is_null(&hdr) ||
++ hdr.payload + hdr.length != da_end)) {
++ wpa_printf(MSG_DEBUG,
++ "PKCS #1: Unexpected digest algorithm parameters");
++ os_free(decrypted);
++ return -1;
++ }
+
+ if (!asn1_oid_equal(&oid, hash_alg)) {
+ char txt[100], txt2[100];
+diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
+index 1bd5aa0..bf2289f 100644
+--- a/src/tls/x509v3.c
++++ b/src/tls/x509v3.c
+@@ -1834,6 +1834,7 @@ int x509_check_signature(struct x509_certificate *issuer,
+ os_free(data);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length);
+
+ pos = hdr.payload;
+ end = pos + hdr.length;
+@@ -1855,6 +1856,8 @@ int x509_check_signature(struct x509_certificate *issuer,
+ os_free(data);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier",
++ hdr.payload, hdr.length);
+ da_end = hdr.payload + hdr.length;
+
+ if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
+@@ -1862,6 +1865,23 @@ int x509_check_signature(struct x509_certificate *issuer,
+ os_free(data);
+ return -1;
+ }
++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters",
++ next, da_end - next);
++
++ /*
++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++ * omit the parameters, but there are implementation that encode these
++ * as a NULL element. Allow these two cases and reject anything else.
++ */
++ if (da_end > next &&
++ (asn1_get_next(next, da_end - next, &hdr) < 0 ||
++ !asn1_is_null(&hdr) ||
++ hdr.payload + hdr.length != da_end)) {
++ wpa_printf(MSG_DEBUG,
++ "X509: Unexpected digest algorithm parameters");
++ os_free(data);
++ return -1;
++ }
+
+ if (x509_sha1_oid(&oid)) {
+ if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) {
+--
+2.17.1
+
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index 357c28634a..cddcfb6811 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -32,6 +32,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
file://0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
file://CVE-2021-0326.patch \
file://CVE-2021-27803.patch \
+ file://CVE-2021-30004.patch \
"
SRC_URI[md5sum] = "2d2958c782576dc9901092fbfecb4190"
SRC_URI[sha256sum] = "fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 51/64] lttng-tools: Fix missing legacy test files
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (49 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 50/64] wpa-supplicant: fix CVE-2021-30004 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 52/64] lttng-tools: Fix path for test_python_looging Anuj Mittal
` (12 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Anders Wallin <wallinux@gmail.com>
tests/regression/tools/save-load
Signed-off-by: Anders Wallin <anders.wallin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2e892895e25d148b4c522e3a30bfb1bb4e9a9506)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
index 7074096ee7..281107db2c 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
@@ -69,7 +69,7 @@ do_install_append () {
}
do_install_ptest () {
- for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/load-42*.lttng tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh; do
+ for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh; do
install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
done
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 52/64] lttng-tools: Fix path for test_python_looging
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (50 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 51/64] lttng-tools: Fix missing legacy test files Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 53/64] cairo: fix CVE-2020-35492 Anuj Mittal
` (11 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Anders Wallin <wallinux@gmail.com>
" was missing
Signed-off-by: Anders Wallin <anders.wallin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e1780ccfc89e9ff4e260276f28ffa0bb8e9b44e1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
index 281107db2c..6132daf1a1 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
@@ -155,7 +155,7 @@ do_install_ptest () {
-i ${D}${PTEST_PATH}/tests/unit/Makefile
# Fix hardcoded build path
- sed -e 's#TESTAPP_PATH=.*/tests/regression/#TESTAPP_PATH=${PTEST_PATH}/tests/regression/#' \
+ sed -e 's#TESTAPP_PATH=.*/tests/regression/#TESTAPP_PATH="${PTEST_PATH}/tests/regression/#' \
-i ${D}${PTEST_PATH}/tests/regression/ust/python-logging/test_python_logging
# Substitute links to installed binaries.
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 53/64] cairo: fix CVE-2020-35492
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (51 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 52/64] lttng-tools: Fix path for test_python_looging Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 54/64] gdk-pixbuf: fix CVE-2021-20240 Anuj Mittal
` (10 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../cairo/cairo/CVE-2020-35492.patch | 121 ++++++++++++++++++
.../cairo/cairo/bug-image-compositor.ref.png | Bin 0 -> 185 bytes
meta/recipes-graphics/cairo/cairo_1.16.0.bb | 11 ++
3 files changed, 132 insertions(+)
create mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
create mode 100644 meta/recipes-graphics/cairo/cairo/bug-image-compositor.ref.png
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch b/meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
new file mode 100644
index 0000000000..f8e69beb0b
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
@@ -0,0 +1,121 @@
+From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
+From: Heiko Lewin <heiko.lewin@worldiety.de>
+Date: Tue, 15 Dec 2020 16:48:19 +0100
+Subject: [PATCH] Fix mask usage in image-compositor
+
+CVE: CVE-2020-35492
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be?merge_request_iid=85]
+
+original patch from upstream has a binary file, it will cause
+do_patch failed with "git binary diffs are not supported".
+
+so add do_patch_append in recipe to add this binary source. when removing
+this patch, please also remove do_patch_append for this patch
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/cairo-image-compositor.c | 8 ++--
+ test/Makefile.sources | 1 +
+ test/bug-image-compositor.c | 39 ++++++++++++++++++++
+ 3 files changed, 44 insertions(+), 4 deletions(-)
+ create mode 100644 test/bug-image-compositor.c
+
+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
+@@ -2610,14 +2610,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;
+diff --git a/test/Makefile.sources b/test/Makefile.sources
+index 7eb73647f..86494348d 100644
+--- a/test/Makefile.sources
++++ b/test/Makefile.sources
+@@ -34,6 +34,7 @@ test_sources = \
+ bug-source-cu.c \
+ bug-extents.c \
+ bug-seams.c \
++ bug-image-compositor.c \
+ caps.c \
+ checkerboard.c \
+ caps-joins.c \
+diff --git a/test/bug-image-compositor.c b/test/bug-image-compositor.c
+new file mode 100644
+index 000000000..fc4fd370b
+--- /dev/null
++++ b/test/bug-image-compositor.c
+@@ -0,0 +1,39 @@
++#include "cairo-test.h"
++
++static cairo_test_status_t
++draw (cairo_t *cr, int width, int height)
++{
++ cairo_set_source_rgb (cr, 0., 0., 0.);
++ cairo_paint (cr);
++
++ cairo_set_source_rgb (cr, 1., 1., 1.);
++ cairo_set_line_width (cr, 1.);
++
++ cairo_pattern_t *p = cairo_pattern_create_linear (0, 0, width, height);
++ cairo_pattern_add_color_stop_rgb (p, 0, 0.99, 1, 1);
++ cairo_pattern_add_color_stop_rgb (p, 1, 1, 1, 1);
++ cairo_set_source (cr, p);
++
++ cairo_move_to (cr, 0.5, -1);
++ for (int i = 0; i < width; i+=3) {
++ cairo_rel_line_to (cr, 2, 2);
++ cairo_rel_line_to (cr, 1, -2);
++ }
++
++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++ cairo_stroke (cr);
++
++ cairo_pattern_destroy(p);
++
++ return CAIRO_TEST_SUCCESS;
++}
++
++
++CAIRO_TEST (bug_image_compositor,
++ "Crash in image-compositor",
++ "stroke, stress", /* keywords */
++ NULL, /* requirements */
++ 10000, 1,
++ NULL, draw)
++
++
+--
+GitLab
diff --git a/meta/recipes-graphics/cairo/cairo/bug-image-compositor.ref.png b/meta/recipes-graphics/cairo/cairo/bug-image-compositor.ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..939f659d2c8620e9927a3a79f5e96fb639c418be
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0y~yP!|BQ89A7M<o7+wF+hqf$=lt9;Xep2*t>i(P$bXO
z#WAE}&f8-f1se=_SPWL_NSx=C)BnJ0eBr6Z%1egFEOv(*t#+|{>X&v^RS7GQe(vez
lf)$wgmAfM(p2Sx&&i!{gWy)N&qd=P(JYD@<);T3K0RWsgHuC@g
literal 0
HcmV?d00001
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index 68f993d7ca..d48da1a4c7 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -27,6 +27,8 @@ 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 \
+ file://bug-image-compositor.ref.png \
"
SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
@@ -64,6 +66,15 @@ export ac_cv_lib_bfd_bfd_openr="no"
# Ensure we don't depend on LZO
export ac_cv_lib_lzo2_lzo2a_decompress="no"
+#for CVE-2020-35492.patch
+do_patch_append() {
+ bb.build.exec_func('do_cp_binary_source', d)
+}
+
+do_cp_binary_source () {
+ cp ${WORKDIR}/bug-image-compositor.ref.png ${S}/test/reference/
+}
+
do_install_append () {
rm -rf ${D}${bindir}/cairo-sphinx
rm -rf ${D}${libdir}/cairo/cairo-fdr*
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 54/64] gdk-pixbuf: fix CVE-2021-20240
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (52 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 53/64] cairo: fix CVE-2020-35492 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 55/64] runqemu: Ensure we cleanup snapshot files after image run Anuj Mittal
` (9 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../gdk-pixbuf/CVE-2021-20240.patch | 40 +++++++++++++++++++
.../gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
new file mode 100644
index 0000000000..fe594b24bb
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-20240.patch
@@ -0,0 +1,40 @@
+From 086e8adf4cc352cd11572f96066b001b545f354e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed, 1 Apr 2020 18:11:55 +0100
+Subject: [PATCH] Check the memset length argument
+
+Avoid overflows by using the checked multiplication macro for gsize.
+
+Fixes: #132
+
+Upstream-Status: Backported [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/086e8adf4cc352cd11572f96066b001b545f354e]
+CVE: CVE-2021-20240
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ gdk-pixbuf/io-gif-animation.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
+index c9db3c66e..49674fd2e 100644
+--- a/gdk-pixbuf/io-gif-animation.c
++++ b/gdk-pixbuf/io-gif-animation.c
+@@ -412,11 +412,15 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter)
+
+ /* If no rendered frame, render the first frame */
+ if (anim->last_frame == NULL) {
++ gsize len = 0;
+ if (anim->last_frame_data == NULL)
+ anim->last_frame_data = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, anim->width, anim->height);
+ if (anim->last_frame_data == NULL)
+ return NULL;
+- memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, gdk_pixbuf_get_rowstride (anim->last_frame_data) * anim->height);
++ if (g_size_checked_mul (&len, gdk_pixbuf_get_rowstride (anim->last_frame_data), anim->height))
++ memset (gdk_pixbuf_get_pixels (anim->last_frame_data), 0, len);
++ else
++ return NULL;
+ composite_frame (anim, g_list_nth_data (anim->frames, 0));
+ }
+
+--
+GitLab
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
index 226e1c7b89..f01da32e71 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
@@ -26,6 +26,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
file://missing-test-data.patch \
file://CVE-2020-29385.patch \
+ file://CVE-2021-20240.patch \
"
SRC_URI_append_class-target = " \
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 55/64] runqemu: Ensure we cleanup snapshot files after image run
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (53 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 54/64] gdk-pixbuf: fix CVE-2021-20240 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 56/64] rpm: Upgrade to 4.16.1.3 Anuj Mittal
` (8 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to cleanup snapshot files if we make a copy of them to ensure
the tmpfs doesn't run out of space. There is already NFS code needing
this so make it a generic code path.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a3e0eec5a4785a0c4859455eb10b43aa832e606d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
scripts/runqemu | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index ba0b701aff..edd17d09c4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -145,7 +145,6 @@ class BaseConfig(object):
self.qemu_opt = ''
self.qemu_opt_script = ''
self.qemuparams = ''
- self.clean_nfs_dir = False
self.nfs_server = ''
self.rootfs = ''
# File name(s) of a OVMF firmware file or variable store,
@@ -210,6 +209,8 @@ class BaseConfig(object):
self.qemupid = None
# avoid cleanup twice
self.cleaned = False
+ # Files to cleanup after run
+ self.cleanup_files = []
def acquire_taplock(self, error=True):
logger.debug("Acquiring lockfile %s..." % self.taplock)
@@ -1020,8 +1021,9 @@ class BaseConfig(object):
logger.info('Running %s...' % str(cmd))
if subprocess.call(cmd) != 0:
raise RunQemuError('Failed to run %s' % cmd)
- self.clean_nfs_dir = True
self.rootfs = dest
+ self.cleanup_files.append(self.rootfs)
+ self.cleanup_files.append('%s.pseudo_state' % self.rootfs)
# Start the userspace NFS server
cmd = ('runqemu-export-rootfs', 'start', self.rootfs)
@@ -1204,6 +1206,7 @@ class BaseConfig(object):
self.rootfs = newrootfs
# Don't need a second copy now!
self.snapshot = False
+ self.cleanup_files.append(newrootfs)
qb_rootfs_opt = self.get('QB_ROOTFS_OPT')
if qb_rootfs_opt:
@@ -1476,10 +1479,13 @@ class BaseConfig(object):
if self.saved_stty:
subprocess.check_call(("stty", self.saved_stty))
- if self.clean_nfs_dir:
- logger.info('Removing %s' % self.rootfs)
- shutil.rmtree(self.rootfs)
- shutil.rmtree('%s.pseudo_state' % self.rootfs)
+ if self.cleanup_files:
+ for ent in self.cleanup_files:
+ logger.info('Removing %s' % ent)
+ if os.path.isfile(ent):
+ os.remove(ent)
+ else:
+ shutil.rmtree(ent)
self.cleaned = True
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 56/64] rpm: Upgrade to 4.16.1.3
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (54 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 55/64] runqemu: Ensure we cleanup snapshot files after image run Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 57/64] cve-update-db-native: skip on empty cpe23Uri Anuj Mittal
` (7 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
Fixes some security vulnerabilities such as CVE-2021-3421 and
CVE-2021-20271.
Rebase 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
to avoid fuzz warnings.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
(cherry picked from commit 25fe972c4aa6ea640b1cdcd1624108f70e539586)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...ot-hardcode-lib-rpm-as-the-installation-path-for.patch | 8 ++++----
.../rpm/{rpm_4.16.1.2.bb => rpm_4.16.1.3.bb} | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/rpm/{rpm_4.16.1.2.bb => rpm_4.16.1.3.bb} (99%)
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
index 38d755205c..d8fcc16729 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
@@ -1,4 +1,4 @@
-From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001
+From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 27 Feb 2017 09:43:30 +0200
Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 6c78568e4..76b1d40e4 100644
+index fe35a90fa..b2faec6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -966,7 +966,7 @@ else
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644
%_infodir %{_datadir}/info
%_mandir %{_datadir}/man
diff --git a/rpm.am b/rpm.am
-index cd40a16be..e6941e09f 100644
+index 8e1dc2184..3d889ec86 100644
--- a/rpm.am
+++ b/rpm.am
@@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index cd40a16be..e6941e09f 100644
+rpmconfigdir = $(libdir)/rpm
# Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 10:2:1
+ rpm_version_info = 10:3:1
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
similarity index 99%
rename from meta/recipes-devtools/rpm/rpm_4.16.1.2.bb
rename to meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
index d369c706a2..7c03b41fc8 100644
--- a/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
@@ -43,7 +43,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \
"
PE = "1"
-SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a"
+SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd"
S = "${WORKDIR}/git"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 57/64] cve-update-db-native: skip on empty cpe23Uri
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (55 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 56/64] rpm: Upgrade to 4.16.1.3 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 58/64] qemu: fix CVE-2021-20181 Anuj Mittal
` (6 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Konrad Weihmann <kweihmann@outlook.com>
Recently an entry in the NVD DB appeared that looks like that
{'vulnerable': True, 'cpe_name': []}.
As besides all the vulnerable flag no data is present we would get
a KeyError exception on acccess.
Use get method on dictionary and return if no meta data is present
Also quit if the length of the array after splitting is less than 6
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 00ce2796d97de2bc376b038d0ea7969088791d34)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-core/meta/cve-update-db-native.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb
index 25ec6bac71..e5822cee58 100644
--- a/meta/recipes-core/meta/cve-update-db-native.bb
+++ b/meta/recipes-core/meta/cve-update-db-native.bb
@@ -139,7 +139,12 @@ def parse_node_and_insert(c, node, cveId):
for cpe in node.get('cpe_match', ()):
if not cpe['vulnerable']:
return
- cpe23 = cpe['cpe23Uri'].split(':')
+ cpe23 = cpe.get('cpe23Uri')
+ if not cpe23:
+ return
+ cpe23 = cpe23.split(':')
+ if len(cpe23) < 6:
+ return
vendor = cpe23[3]
product = cpe23[4]
version = cpe23[5]
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 58/64] qemu: fix CVE-2021-20181
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (56 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 57/64] cve-update-db-native: skip on empty cpe23Uri Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 59/64] qemu: fix CVE-2020-29443 Anuj Mittal
` (5 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c2f79065ef0684f2c0bdb92f1b03e690ab730b8c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2021-20181.patch | 81 +++++++++++++++++++
2 files changed, 82 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20181.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index f0416b0379..65e0489a97 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -34,6 +34,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-35517_1.patch \
file://CVE-2020-35517_2.patch \
file://CVE-2020-35517_3.patch \
+ file://CVE-2021-20181.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20181.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20181.patch
new file mode 100644
index 0000000000..1b8c77f838
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20181.patch
@@ -0,0 +1,81 @@
+From c2d2d14e8deece958bbc4fc649d22c3564bc4e7e Mon Sep 17 00:00:00 2001
+From: Greg Kurz <groug@kaod.org>
+Date: Thu, 14 Jan 2021 17:04:12 +0100
+Subject: [PATCH] 9pfs: Fully restart unreclaim loop (CVE-2021-20181)
+
+Depending on the client activity, the server can be asked to open a huge
+number of file descriptors and eventually hit RLIMIT_NOFILE. This is
+currently mitigated using a reclaim logic : the server closes the file
+descriptors of idle fids, based on the assumption that it will be able
+to re-open them later. This assumption doesn't hold of course if the
+client requests the file to be unlinked. In this case, we loop on the
+entire fid list and mark all related fids as unreclaimable (the reclaim
+logic will just ignore them) and, of course, we open or re-open their
+file descriptors if needed since we're about to unlink the file.
+
+This is the purpose of v9fs_mark_fids_unreclaim(). Since the actual
+opening of a file can cause the coroutine to yield, another client
+request could possibly add a new fid that we may want to mark as
+non-reclaimable as well. The loop is thus restarted if the re-open
+request was actually transmitted to the backend. This is achieved
+by keeping a reference on the first fid (head) before traversing
+the list.
+
+This is wrong in several ways:
+- a potential clunk request from the client could tear the first
+ fid down and cause the reference to be stale. This leads to a
+ use-after-free error that can be detected with ASAN, using a
+ custom 9p client
+- fids are added at the head of the list : restarting from the
+ previous head will always miss fids added by a some other
+ potential request
+
+All these problems could be avoided if fids were being added at the
+end of the list. This can be achieved with a QSIMPLEQ, but this is
+probably too much change for a bug fix. For now let's keep it
+simple and just restart the loop from the current head.
+
+Fixes: CVE-2021-20181
+Buglink: https://bugs.launchpad.net/qemu/+bug/1911666
+Reported-by: Zero Day Initiative <zdi-disclosures@trendmicro.com>
+Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Message-Id: <161064025265.1838153.15185571283519390907.stgit@bahia.lan>
+Signed-off-by: Greg Kurz <groug@kaod.org>
+
+Upstream-Status: Backport [89fbea8737e8f7b954745a1ffc4238d377055305]
+CVE: CVE-2021-20181
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/9pfs/9p.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
+index 94df440fc..6026b51a1 100644
+--- a/hw/9pfs/9p.c
++++ b/hw/9pfs/9p.c
+@@ -502,9 +502,9 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path)
+ {
+ int err;
+ V9fsState *s = pdu->s;
+- V9fsFidState *fidp, head_fid;
++ V9fsFidState *fidp;
+
+- head_fid.next = s->fid_list;
++again:
+ for (fidp = s->fid_list; fidp; fidp = fidp->next) {
+ if (fidp->path.size != path->size) {
+ continue;
+@@ -524,7 +524,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path)
+ * switched to the worker thread
+ */
+ if (err == 0) {
+- fidp = &head_fid;
++ goto again;
+ }
+ }
+ }
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 59/64] qemu: fix CVE-2020-29443
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (57 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 58/64] qemu: fix CVE-2021-20181 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 60/64] qemu: fix CVE-2021-20221 Anuj Mittal
` (4 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 481e012de865ee232fa5a233e9f1d4fc7a2232ab)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2020-29443.patch | 107 ++++++++++++++++++
2 files changed, 108 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-29443.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 65e0489a97..fc9c9e15f9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -35,6 +35,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-35517_2.patch \
file://CVE-2020-35517_3.patch \
file://CVE-2021-20181.patch \
+ file://CVE-2020-29443.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-29443.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-29443.patch
new file mode 100644
index 0000000000..c72324fce6
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-29443.patch
@@ -0,0 +1,107 @@
+From c9a71afe182be5b62bd2ccdaf861695e0ec0731a Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 18 Jan 2021 17:21:30 +0530
+Subject: [PATCH] ide: atapi: check logical block address and read size
+ (CVE-2020-29443)
+
+While processing ATAPI cmd_read/cmd_read_cd commands,
+Logical Block Address (LBA) maybe invalid OR closer to the last block,
+leading to an OOB access issues. Add range check to avoid it.
+
+Fixes: CVE-2020-29443
+Reported-by: Wenxiang Qian <leonwxqian@gmail.com>
+Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Message-Id: <20210118115130.457044-1-ppandit@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream-Status: Backport [b8d7f1bc59276fec85e4d09f1567613a3e14d31e]
+CVE: CVE-2020-29443
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/ide/atapi.c | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
+index e79157863..b626199e3 100644
+--- a/hw/ide/atapi.c
++++ b/hw/ide/atapi.c
+@@ -322,6 +322,8 @@ static void ide_atapi_cmd_reply(IDEState *s, int size, int max_size)
+ static void ide_atapi_cmd_read_pio(IDEState *s, int lba, int nb_sectors,
+ int sector_size)
+ {
++ assert(0 <= lba && lba < (s->nb_sectors >> 2));
++
+ s->lba = lba;
+ s->packet_transfer_size = nb_sectors * sector_size;
+ s->elementary_transfer_size = 0;
+@@ -420,6 +422,8 @@ eot:
+ static void ide_atapi_cmd_read_dma(IDEState *s, int lba, int nb_sectors,
+ int sector_size)
+ {
++ assert(0 <= lba && lba < (s->nb_sectors >> 2));
++
+ s->lba = lba;
+ s->packet_transfer_size = nb_sectors * sector_size;
+ s->io_buffer_size = 0;
+@@ -973,35 +977,49 @@ static void cmd_prevent_allow_medium_removal(IDEState *s, uint8_t* buf)
+
+ static void cmd_read(IDEState *s, uint8_t* buf)
+ {
+- int nb_sectors, lba;
++ unsigned int nb_sectors, lba;
++
++ /* Total logical sectors of ATAPI_SECTOR_SIZE(=2048) bytes */
++ uint64_t total_sectors = s->nb_sectors >> 2;
+
+ if (buf[0] == GPCMD_READ_10) {
+ nb_sectors = lduw_be_p(buf + 7);
+ } else {
+ nb_sectors = ldl_be_p(buf + 6);
+ }
+-
+- lba = ldl_be_p(buf + 2);
+ if (nb_sectors == 0) {
+ ide_atapi_cmd_ok(s);
+ return;
+ }
+
++ lba = ldl_be_p(buf + 2);
++ if (lba >= total_sectors || lba + nb_sectors - 1 >= total_sectors) {
++ ide_atapi_cmd_error(s, ILLEGAL_REQUEST, ASC_LOGICAL_BLOCK_OOR);
++ return;
++ }
++
+ ide_atapi_cmd_read(s, lba, nb_sectors, 2048);
+ }
+
+ static void cmd_read_cd(IDEState *s, uint8_t* buf)
+ {
+- int nb_sectors, lba, transfer_request;
++ unsigned int nb_sectors, lba, transfer_request;
+
+- nb_sectors = (buf[6] << 16) | (buf[7] << 8) | buf[8];
+- lba = ldl_be_p(buf + 2);
++ /* Total logical sectors of ATAPI_SECTOR_SIZE(=2048) bytes */
++ uint64_t total_sectors = s->nb_sectors >> 2;
+
++ nb_sectors = (buf[6] << 16) | (buf[7] << 8) | buf[8];
+ if (nb_sectors == 0) {
+ ide_atapi_cmd_ok(s);
+ return;
+ }
+
++ lba = ldl_be_p(buf + 2);
++ if (lba >= total_sectors || lba + nb_sectors - 1 >= total_sectors) {
++ ide_atapi_cmd_error(s, ILLEGAL_REQUEST, ASC_LOGICAL_BLOCK_OOR);
++ return;
++ }
++
+ transfer_request = buf[9] & 0xf8;
+ if (transfer_request == 0x00) {
+ /* nothing */
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 60/64] qemu: fix CVE-2021-20221
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (58 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 59/64] qemu: fix CVE-2020-29443 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 61/64] qemu: fix CVE-2021-3409 Anuj Mittal
` (3 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 59a44f8c70d4a026ae74e44b9d70100029c691b5)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2021-20221.patch | 70 +++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20221.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index fc9c9e15f9..f118772208 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -36,6 +36,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-35517_3.patch \
file://CVE-2021-20181.patch \
file://CVE-2020-29443.patch \
+ file://CVE-2021-20221.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20221.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20221.patch
new file mode 100644
index 0000000000..d762a51d02
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20221.patch
@@ -0,0 +1,70 @@
+From e428bcfb86fb46d9773ae11e69712052dcff3d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
+Date: Sun, 31 Jan 2021 11:34:01 +0100
+Subject: [PATCH] hw/intc/arm_gic: Fix interrupt ID in GICD_SGIR register
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the ARM Generic Interrupt Controller Architecture specification
+(document "ARM IHI 0048B.b (ID072613)"), the SGIINTID field is 4 bit,
+not 10:
+
+ - 4.3 Distributor register descriptions
+ - 4.3.15 Software Generated Interrupt Register, GICD_SG
+
+ - Table 4-21 GICD_SGIR bit assignments
+
+ The Interrupt ID of the SGI to forward to the specified CPU
+ interfaces. The value of this field is the Interrupt ID, in
+ the range 0-15, for example a value of 0b0011 specifies
+ Interrupt ID 3.
+
+Correct the irq mask to fix an undefined behavior (which eventually
+lead to a heap-buffer-overflow, see [Buglink]):
+
+ $ echo 'writel 0x8000f00 0xff4affb0' | qemu-system-aarch64 -M virt,accel=qtest -qtest stdio
+ [I 1612088147.116987] OPENED
+ [R +0.278293] writel 0x8000f00 0xff4affb0
+ ../hw/intc/arm_gic.c:1498:13: runtime error: index 944 out of bounds for type 'uint8_t [16][8]'
+ SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ../hw/intc/arm_gic.c:1498:13
+
+This fixes a security issue when running with KVM on Arm with
+kernel-irqchip=off. (The default is kernel-irqchip=on, which is
+unaffected, and which is also the correct choice for performance.)
+
+Cc: qemu-stable@nongnu.org
+Fixes: CVE-2021-20221
+Fixes: 9ee6e8bb853 ("ARMv7 support.")
+Buglink: https://bugs.launchpad.net/qemu/+bug/1913916
+Buglink: https://bugs.launchpad.net/qemu/+bug/1913917
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Message-id: 20210131103401.217160-1-f4bug@amsat.org
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+
+Upstream-Status: Backport [edfe2eb4360cde4ed5d95bda7777edcb3510f76a]
+CVE: CVE-2021-20221
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/intc/arm_gic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
+index c60dc6b5e..fbde60de0 100644
+--- a/hw/intc/arm_gic.c
++++ b/hw/intc/arm_gic.c
+@@ -1474,7 +1474,7 @@ static void gic_dist_writel(void *opaque, hwaddr offset,
+ int target_cpu;
+
+ cpu = gic_get_current_cpu(s);
+- irq = value & 0x3ff;
++ irq = value & 0xf;
+ switch ((value >> 24) & 3) {
+ case 0:
+ mask = (value >> 16) & ALL_CPU_MASK;
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 61/64] qemu: fix CVE-2021-3409
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (59 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 60/64] qemu: fix CVE-2021-20221 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 62/64] qemu: fix CVE-2021-3416 Anuj Mittal
` (2 subsequent siblings)
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2fb8c15a64e1f5db678e8e95924da8c88a188c0)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 6 +
.../qemu/qemu/CVE-2021-3409_1.patch | 56 +++++++++
.../qemu/qemu/CVE-2021-3409_2.patch | 92 +++++++++++++++
.../qemu/qemu/CVE-2021-3409_3.patch | 109 ++++++++++++++++++
.../qemu/qemu/CVE-2021-3409_4.patch | 75 ++++++++++++
.../qemu/qemu/CVE-2021-3409_5.patch | 56 +++++++++
.../qemu/qemu/CVE-2021-3409_6.patch | 99 ++++++++++++++++
7 files changed, 493 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_5.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3409_6.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index f118772208..0ac33f87fc 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -37,6 +37,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2021-20181.patch \
file://CVE-2020-29443.patch \
file://CVE-2021-20221.patch \
+ file://CVE-2021-3409_1.patch \
+ file://CVE-2021-3409_2.patch \
+ file://CVE-2021-3409_3.patch \
+ file://CVE-2021-3409_4.patch \
+ file://CVE-2021-3409_5.patch \
+ file://CVE-2021-3409_6.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_1.patch
new file mode 100644
index 0000000000..f9395add43
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_1.patch
@@ -0,0 +1,56 @@
+From c01ae9a35b3c6b4a8e1f1bfa0a0caafe394f8b5c Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Tue, 16 Feb 2021 11:46:52 +0800
+Subject: [PATCH 1/6] hw/sd: sdhci: Simplify updating s->prnsts in
+ sdhci_sdma_transfer_multi_blocks()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+s->prnsts is updated in both branches of the if () else () statement.
+Move the common bits outside so that it is cleaner.
+
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Message-Id: <1613447214-81951-5-git-send-email-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [8bc1f1aa51d32c3184e7b19d5b94c35ecc06f056]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index 2f8b74a84..f83c5e295 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -596,9 +596,9 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
+ page_aligned = true;
+ }
+
++ s->prnsts |= SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE;
+ if (s->trnmod & SDHC_TRNS_READ) {
+- s->prnsts |= SDHC_DOING_READ | SDHC_DATA_INHIBIT |
+- SDHC_DAT_LINE_ACTIVE;
++ s->prnsts |= SDHC_DOING_READ;
+ while (s->blkcnt) {
+ if (s->data_count == 0) {
+ sdbus_read_data(&s->sdbus, s->fifo_buffer, block_size);
+@@ -625,8 +625,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
+ }
+ }
+ } else {
+- s->prnsts |= SDHC_DOING_WRITE | SDHC_DATA_INHIBIT |
+- SDHC_DAT_LINE_ACTIVE;
++ s->prnsts |= SDHC_DOING_WRITE;
+ while (s->blkcnt) {
+ begin = s->data_count;
+ if (((boundary_count + begin) < block_size) && page_aligned) {
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_2.patch
new file mode 100644
index 0000000000..f3d2bb1375
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_2.patch
@@ -0,0 +1,92 @@
+From b9bb4700798bce98888c51d7b6dbc19ec49159d5 Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Wed, 3 Mar 2021 20:26:35 +0800
+Subject: [PATCH 2/6] hw/sd: sdhci: Don't transfer any data when command time
+ out
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+At the end of sdhci_send_command(), it starts a data transfer if the
+command register indicates data is associated. But the data transfer
+should only be initiated when the command execution has succeeded.
+
+With this fix, the following reproducer:
+
+outl 0xcf8 0x80001810
+outl 0xcfc 0xe1068000
+outl 0xcf8 0x80001804
+outw 0xcfc 0x7
+write 0xe106802c 0x1 0x0f
+write 0xe1068004 0xc 0x2801d10101fffffbff28a384
+write 0xe106800c 0x1f 0x9dacbbcad9e8f7061524334251606f7e8d9cabbac9d8e7f60514233241505f
+write 0xe1068003 0x28 0x80d000251480d000252280d000253080d000253e80d000254c80d000255a80d000256880d0002576
+write 0xe1068003 0x1 0xfe
+
+cannot be reproduced with the following QEMU command line:
+
+$ qemu-system-x86_64 -nographic -M pc-q35-5.0 \
+ -device sdhci-pci,sd-spec-version=3 \
+ -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \
+ -device sd-card,drive=mydrive \
+ -monitor none -serial none -qtest stdio
+
+Cc: qemu-stable@nongnu.org
+Fixes: CVE-2020-17380
+Fixes: CVE-2020-25085
+Fixes: CVE-2021-3409
+Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller")
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum)
+Reported-by: Sergej Schumilo (Ruhr-Universität Bochum)
+Reported-by: Simon Wörner (Ruhr-Universität Bochum)
+Buglink: https://bugs.launchpad.net/qemu/+bug/1892960
+Buglink: https://bugs.launchpad.net/qemu/+bug/1909418
+Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146
+Acked-by: Alistair Francis <alistair.francis@wdc.com>
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Message-Id: <20210303122639.20004-2-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [b263d8f928001b5cfa2a993ea43b7a5b3a1811e8]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index f83c5e295..44f8a82ea 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -326,6 +326,7 @@ static void sdhci_send_command(SDHCIState *s)
+ SDRequest request;
+ uint8_t response[16];
+ int rlen;
++ bool timeout = false;
+
+ s->errintsts = 0;
+ s->acmd12errsts = 0;
+@@ -349,6 +350,7 @@ static void sdhci_send_command(SDHCIState *s)
+ trace_sdhci_response16(s->rspreg[3], s->rspreg[2],
+ s->rspreg[1], s->rspreg[0]);
+ } else {
++ timeout = true;
+ trace_sdhci_error("timeout waiting for command response");
+ if (s->errintstsen & SDHC_EISEN_CMDTIMEOUT) {
+ s->errintsts |= SDHC_EIS_CMDTIMEOUT;
+@@ -369,7 +371,7 @@ static void sdhci_send_command(SDHCIState *s)
+
+ sdhci_update_irq(s);
+
+- if (s->blksize && (s->cmdreg & SDHC_CMD_DATA_PRESENT)) {
++ if (!timeout && s->blksize && (s->cmdreg & SDHC_CMD_DATA_PRESENT)) {
+ s->data_count = 0;
+ sdhci_data_transfer(s);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_3.patch
new file mode 100644
index 0000000000..c3b37ed616
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_3.patch
@@ -0,0 +1,109 @@
+From 405ca416ccc8135544a4fe5732974497244128c9 Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Wed, 3 Mar 2021 20:26:36 +0800
+Subject: [PATCH 3/6] hw/sd: sdhci: Don't write to SDHC_SYSAD register when
+ transfer is in progress
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per "SD Host Controller Standard Specification Version 7.00"
+chapter 2.2.1 SDMA System Address Register:
+
+This register can be accessed only if no transaction is executing
+(i.e., after a transaction has stopped).
+
+With this fix, the following reproducer:
+
+outl 0xcf8 0x80001010
+outl 0xcfc 0xfbefff00
+outl 0xcf8 0x80001001
+outl 0xcfc 0x06000000
+write 0xfbefff2c 0x1 0x05
+write 0xfbefff0f 0x1 0x37
+write 0xfbefff0a 0x1 0x01
+write 0xfbefff0f 0x1 0x29
+write 0xfbefff0f 0x1 0x02
+write 0xfbefff0f 0x1 0x03
+write 0xfbefff04 0x1 0x01
+write 0xfbefff05 0x1 0x01
+write 0xfbefff07 0x1 0x02
+write 0xfbefff0c 0x1 0x33
+write 0xfbefff0e 0x1 0x20
+write 0xfbefff0f 0x1 0x00
+write 0xfbefff2a 0x1 0x01
+write 0xfbefff0c 0x1 0x00
+write 0xfbefff03 0x1 0x00
+write 0xfbefff05 0x1 0x00
+write 0xfbefff2a 0x1 0x02
+write 0xfbefff0c 0x1 0x32
+write 0xfbefff01 0x1 0x01
+write 0xfbefff02 0x1 0x01
+write 0xfbefff03 0x1 0x01
+
+cannot be reproduced with the following QEMU command line:
+
+$ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \
+ -nodefaults -device sdhci-pci,sd-spec-version=3 \
+ -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \
+ -device sd-card,drive=mydrive -qtest stdio
+
+Cc: qemu-stable@nongnu.org
+Fixes: CVE-2020-17380
+Fixes: CVE-2020-25085
+Fixes: CVE-2021-3409
+Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller")
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum)
+Reported-by: Sergej Schumilo (Ruhr-Universität Bochum)
+Reported-by: Simon Wörner (Ruhr-Universität Bochum)
+Buglink: https://bugs.launchpad.net/qemu/+bug/1892960
+Buglink: https://bugs.launchpad.net/qemu/+bug/1909418
+Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Message-Id: <20210303122639.20004-3-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [8be45cc947832b3c02144c9d52921f499f2d77fe]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index 44f8a82ea..d8a46f307 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -1121,15 +1121,17 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
+
+ switch (offset & ~0x3) {
+ case SDHC_SYSAD:
+- s->sdmasysad = (s->sdmasysad & mask) | value;
+- MASKED_WRITE(s->sdmasysad, mask, value);
+- /* Writing to last byte of sdmasysad might trigger transfer */
+- if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blkcnt &&
+- s->blksize && SDHC_DMA_TYPE(s->hostctl1) == SDHC_CTRL_SDMA) {
+- if (s->trnmod & SDHC_TRNS_MULTI) {
+- sdhci_sdma_transfer_multi_blocks(s);
+- } else {
+- sdhci_sdma_transfer_single_block(s);
++ if (!TRANSFERRING_DATA(s->prnsts)) {
++ s->sdmasysad = (s->sdmasysad & mask) | value;
++ MASKED_WRITE(s->sdmasysad, mask, value);
++ /* Writing to last byte of sdmasysad might trigger transfer */
++ if (!(mask & 0xFF000000) && s->blkcnt && s->blksize &&
++ SDHC_DMA_TYPE(s->hostctl1) == SDHC_CTRL_SDMA) {
++ if (s->trnmod & SDHC_TRNS_MULTI) {
++ sdhci_sdma_transfer_multi_blocks(s);
++ } else {
++ sdhci_sdma_transfer_single_block(s);
++ }
+ }
+ }
+ break;
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch
new file mode 100644
index 0000000000..d5be99759d
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_4.patch
@@ -0,0 +1,75 @@
+From b672bcaf5522294a4d8de3e88e0932d55585ee3b Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Wed, 3 Mar 2021 20:26:37 +0800
+Subject: [PATCH 4/6] hw/sd: sdhci: Correctly set the controller status for
+ ADMA
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When an ADMA transfer is started, the codes forget to set the
+controller status to indicate a transfer is in progress.
+
+With this fix, the following 2 reproducers:
+
+https://paste.debian.net/plain/1185136
+https://paste.debian.net/plain/1185141
+
+cannot be reproduced with the following QEMU command line:
+
+$ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \
+ -nodefaults -device sdhci-pci,sd-spec-version=3 \
+ -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \
+ -device sd-card,drive=mydrive -qtest stdio
+
+Cc: qemu-stable@nongnu.org
+Fixes: CVE-2020-17380
+Fixes: CVE-2020-25085
+Fixes: CVE-2021-3409
+Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller")
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum)
+Reported-by: Sergej Schumilo (Ruhr-Universität Bochum)
+Reported-by: Simon Wörner (Ruhr-Universität Bochum)
+Buglink: https://bugs.launchpad.net/qemu/+bug/1892960
+Buglink: https://bugs.launchpad.net/qemu/+bug/1909418
+Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Message-Id: <20210303122639.20004-4-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [bc6f28995ff88f5d82c38afcfd65406f0ae375aa]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index d8a46f307..7de03c6dd 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -768,7 +768,9 @@ static void sdhci_do_adma(SDHCIState *s)
+
+ switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) {
+ case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */
++ s->prnsts |= SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE;
+ if (s->trnmod & SDHC_TRNS_READ) {
++ s->prnsts |= SDHC_DOING_READ;
+ while (length) {
+ if (s->data_count == 0) {
+ sdbus_read_data(&s->sdbus, s->fifo_buffer, block_size);
+@@ -796,6 +798,7 @@ static void sdhci_do_adma(SDHCIState *s)
+ }
+ }
+ } else {
++ s->prnsts |= SDHC_DOING_WRITE;
+ while (length) {
+ begin = s->data_count;
+ if ((length + begin) < block_size) {
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_5.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_5.patch
new file mode 100644
index 0000000000..7199056838
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_5.patch
@@ -0,0 +1,56 @@
+From c2298884cf6bcf2b047b4bae5f78432b052b5729 Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Wed, 3 Mar 2021 20:26:38 +0800
+Subject: [PATCH 5/6] hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE
+ register is writable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The codes to limit the maximum block size is only necessary when
+SDHC_BLKSIZE register is writable.
+
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Message-Id: <20210303122639.20004-5-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [5cd7aa3451b76bb19c0f6adc2b931f091e5d7fcd]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index 7de03c6dd..6c780126e 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -1142,15 +1142,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
+ if (!TRANSFERRING_DATA(s->prnsts)) {
+ MASKED_WRITE(s->blksize, mask, extract32(value, 0, 12));
+ MASKED_WRITE(s->blkcnt, mask >> 16, value >> 16);
+- }
+
+- /* Limit block size to the maximum buffer size */
+- if (extract32(s->blksize, 0, 12) > s->buf_maxsz) {
+- qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than "
+- "the maximum buffer 0x%x\n", __func__, s->blksize,
+- s->buf_maxsz);
++ /* Limit block size to the maximum buffer size */
++ if (extract32(s->blksize, 0, 12) > s->buf_maxsz) {
++ qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than "
++ "the maximum buffer 0x%x\n", __func__, s->blksize,
++ s->buf_maxsz);
+
+- s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz);
++ s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz);
++ }
+ }
+
+ break;
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_6.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_6.patch
new file mode 100644
index 0000000000..624c1f6496
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3409_6.patch
@@ -0,0 +1,99 @@
+From db916870a839346767b6d5ca7d0eed3128ba5fea Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Wed, 3 Mar 2021 20:26:39 +0800
+Subject: [PATCH 6/6] hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[]
+ when a different block size is programmed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the block size is programmed to a different value from the
+previous one, reset the data pointer of s->fifo_buffer[] so that
+s->fifo_buffer[] can be filled in using the new block size in
+the next transfer.
+
+With this fix, the following reproducer:
+
+outl 0xcf8 0x80001010
+outl 0xcfc 0xe0000000
+outl 0xcf8 0x80001001
+outl 0xcfc 0x06000000
+write 0xe000002c 0x1 0x05
+write 0xe0000005 0x1 0x02
+write 0xe0000007 0x1 0x01
+write 0xe0000028 0x1 0x10
+write 0x0 0x1 0x23
+write 0x2 0x1 0x08
+write 0xe000000c 0x1 0x01
+write 0xe000000e 0x1 0x20
+write 0xe000000f 0x1 0x00
+write 0xe000000c 0x1 0x32
+write 0xe0000004 0x2 0x0200
+write 0xe0000028 0x1 0x00
+write 0xe0000003 0x1 0x40
+
+cannot be reproduced with the following QEMU command line:
+
+$ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \
+ -nodefaults -device sdhci-pci,sd-spec-version=3 \
+ -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \
+ -device sd-card,drive=mydrive -qtest stdio
+
+Cc: qemu-stable@nongnu.org
+Fixes: CVE-2020-17380
+Fixes: CVE-2020-25085
+Fixes: CVE-2021-3409
+Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller")
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum)
+Reported-by: Sergej Schumilo (Ruhr-Universität Bochum)
+Reported-by: Simon Wörner (Ruhr-Universität Bochum)
+Buglink: https://bugs.launchpad.net/qemu/+bug/1892960
+Buglink: https://bugs.launchpad.net/qemu/+bug/1909418
+Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146
+Tested-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+Message-Id: <20210303122639.20004-6-bmeng.cn@gmail.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+Upstream-Status: Backport [cffb446e8fd19a14e1634c7a3a8b07be3f01d5c9]
+CVE: CVE-2021-3409
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/sd/sdhci.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
+index 6c780126e..216842420 100644
+--- a/hw/sd/sdhci.c
++++ b/hw/sd/sdhci.c
+@@ -1140,6 +1140,8 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
+ break;
+ case SDHC_BLKSIZE:
+ if (!TRANSFERRING_DATA(s->prnsts)) {
++ uint16_t blksize = s->blksize;
++
+ MASKED_WRITE(s->blksize, mask, extract32(value, 0, 12));
+ MASKED_WRITE(s->blkcnt, mask >> 16, value >> 16);
+
+@@ -1151,6 +1153,16 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
+
+ s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz);
+ }
++
++ /*
++ * If the block size is programmed to a different value from
++ * the previous one, reset the data pointer of s->fifo_buffer[]
++ * so that s->fifo_buffer[] can be filled in using the new block
++ * size in the next transfer.
++ */
++ if (blksize != s->blksize) {
++ s->data_count = 0;
++ }
+ }
+
+ break;
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 62/64] qemu: fix CVE-2021-3416
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (60 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 61/64] qemu: fix CVE-2021-3409 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 63/64] qemu: fix CVE-2021-20257 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 64/64] go: Use dl.google.com for SRC_URI Anuj Mittal
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2b5bc11d1b26b73b62e1a63cb75572793282dcb)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 10 +
.../qemu/qemu/CVE-2021-3416_1.patch | 177 ++++++++++++++++++
.../qemu/qemu/CVE-2021-3416_10.patch | 44 +++++
.../qemu/qemu/CVE-2021-3416_2.patch | 42 +++++
.../qemu/qemu/CVE-2021-3416_3.patch | 43 +++++
.../qemu/qemu/CVE-2021-3416_4.patch | 43 +++++
.../qemu/qemu/CVE-2021-3416_5.patch | 45 +++++
.../qemu/qemu/CVE-2021-3416_6.patch | 43 +++++
.../qemu/qemu/CVE-2021-3416_7.patch | 45 +++++
.../qemu/qemu/CVE-2021-3416_8.patch | 44 +++++
.../qemu/qemu/CVE-2021-3416_9.patch | 46 +++++
11 files changed, 582 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_10.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_3.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_4.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_5.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_6.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_8.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3416_9.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 0ac33f87fc..177e453fff 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -43,6 +43,16 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2021-3409_4.patch \
file://CVE-2021-3409_5.patch \
file://CVE-2021-3409_6.patch \
+ file://CVE-2021-3416_1.patch \
+ file://CVE-2021-3416_2.patch \
+ file://CVE-2021-3416_3.patch \
+ file://CVE-2021-3416_4.patch \
+ file://CVE-2021-3416_5.patch \
+ file://CVE-2021-3416_6.patch \
+ file://CVE-2021-3416_7.patch \
+ file://CVE-2021-3416_8.patch \
+ file://CVE-2021-3416_9.patch \
+ file://CVE-2021-3416_10.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_1.patch
new file mode 100644
index 0000000000..5bacd67481
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_1.patch
@@ -0,0 +1,177 @@
+From 4b1988a29d67277d6c8ce1df52975f5616592913 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 11:44:36 +0800
+Subject: [PATCH 01/10] net: introduce qemu_receive_packet()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some NIC supports loopback mode and this is done by calling
+nc->info->receive() directly which in fact suppresses the effort of
+reentrancy check that is done in qemu_net_queue_send().
+
+Unfortunately we can't use qemu_net_queue_send() here since for
+loopback there's no sender as peer, so this patch introduce a
+qemu_receive_packet() which is used for implementing loopback mode
+for a NIC with this check.
+
+NIC that supports loopback mode will be converted to this helper.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [705df5466c98f3efdd2b68d3b31dad86858acad7]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ include/net/net.h | 5 +++++
+ include/net/queue.h | 8 ++++++++
+ net/net.c | 38 +++++++++++++++++++++++++++++++-------
+ net/queue.c | 22 ++++++++++++++++++++++
+ 4 files changed, 66 insertions(+), 7 deletions(-)
+
+diff --git a/include/net/net.h b/include/net/net.h
+index 778fc787c..03f058ecb 100644
+--- a/include/net/net.h
++++ b/include/net/net.h
+@@ -143,12 +143,17 @@ void *qemu_get_nic_opaque(NetClientState *nc);
+ void qemu_del_net_client(NetClientState *nc);
+ typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque);
+ void qemu_foreach_nic(qemu_nic_foreach func, void *opaque);
++int qemu_can_receive_packet(NetClientState *nc);
+ int qemu_can_send_packet(NetClientState *nc);
+ ssize_t qemu_sendv_packet(NetClientState *nc, const struct iovec *iov,
+ int iovcnt);
+ ssize_t qemu_sendv_packet_async(NetClientState *nc, const struct iovec *iov,
+ int iovcnt, NetPacketSent *sent_cb);
+ ssize_t qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size);
++ssize_t qemu_receive_packet(NetClientState *nc, const uint8_t *buf, int size);
++ssize_t qemu_receive_packet_iov(NetClientState *nc,
++ const struct iovec *iov,
++ int iovcnt);
+ ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size);
+ ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf,
+ int size, NetPacketSent *sent_cb);
+diff --git a/include/net/queue.h b/include/net/queue.h
+index c0269bb1d..9f2f289d7 100644
+--- a/include/net/queue.h
++++ b/include/net/queue.h
+@@ -55,6 +55,14 @@ void qemu_net_queue_append_iov(NetQueue *queue,
+
+ void qemu_del_net_queue(NetQueue *queue);
+
++ssize_t qemu_net_queue_receive(NetQueue *queue,
++ const uint8_t *data,
++ size_t size);
++
++ssize_t qemu_net_queue_receive_iov(NetQueue *queue,
++ const struct iovec *iov,
++ int iovcnt);
++
+ ssize_t qemu_net_queue_send(NetQueue *queue,
+ NetClientState *sender,
+ unsigned flags,
+diff --git a/net/net.c b/net/net.c
+index 6a2c3d956..5e15e5d27 100644
+--- a/net/net.c
++++ b/net/net.c
+@@ -528,6 +528,17 @@ int qemu_set_vnet_be(NetClientState *nc, bool is_be)
+ #endif
+ }
+
++int qemu_can_receive_packet(NetClientState *nc)
++{
++ if (nc->receive_disabled) {
++ return 0;
++ } else if (nc->info->can_receive &&
++ !nc->info->can_receive(nc)) {
++ return 0;
++ }
++ return 1;
++}
++
+ int qemu_can_send_packet(NetClientState *sender)
+ {
+ int vm_running = runstate_is_running();
+@@ -540,13 +551,7 @@ int qemu_can_send_packet(NetClientState *sender)
+ return 1;
+ }
+
+- if (sender->peer->receive_disabled) {
+- return 0;
+- } else if (sender->peer->info->can_receive &&
+- !sender->peer->info->can_receive(sender->peer)) {
+- return 0;
+- }
+- return 1;
++ return qemu_can_receive_packet(sender->peer);
+ }
+
+ static ssize_t filter_receive_iov(NetClientState *nc,
+@@ -679,6 +684,25 @@ ssize_t qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size)
+ return qemu_send_packet_async(nc, buf, size, NULL);
+ }
+
++ssize_t qemu_receive_packet(NetClientState *nc, const uint8_t *buf, int size)
++{
++ if (!qemu_can_receive_packet(nc)) {
++ return 0;
++ }
++
++ return qemu_net_queue_receive(nc->incoming_queue, buf, size);
++}
++
++ssize_t qemu_receive_packet_iov(NetClientState *nc, const struct iovec *iov,
++ int iovcnt)
++{
++ if (!qemu_can_receive_packet(nc)) {
++ return 0;
++ }
++
++ return qemu_net_queue_receive_iov(nc->incoming_queue, iov, iovcnt);
++}
++
+ ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size)
+ {
+ return qemu_send_packet_async_with_flags(nc, QEMU_NET_PACKET_FLAG_RAW,
+diff --git a/net/queue.c b/net/queue.c
+index 19e32c80f..c872d51df 100644
+--- a/net/queue.c
++++ b/net/queue.c
+@@ -182,6 +182,28 @@ static ssize_t qemu_net_queue_deliver_iov(NetQueue *queue,
+ return ret;
+ }
+
++ssize_t qemu_net_queue_receive(NetQueue *queue,
++ const uint8_t *data,
++ size_t size)
++{
++ if (queue->delivering) {
++ return 0;
++ }
++
++ return qemu_net_queue_deliver(queue, NULL, 0, data, size);
++}
++
++ssize_t qemu_net_queue_receive_iov(NetQueue *queue,
++ const struct iovec *iov,
++ int iovcnt)
++{
++ if (queue->delivering) {
++ return 0;
++ }
++
++ return qemu_net_queue_deliver_iov(queue, NULL, 0, iov, iovcnt);
++}
++
+ ssize_t qemu_net_queue_send(NetQueue *queue,
+ NetClientState *sender,
+ unsigned flags,
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_10.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_10.patch
new file mode 100644
index 0000000000..7deec1a347
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_10.patch
@@ -0,0 +1,44 @@
+From 65b851efd3d0280425c202f4e5880c48f8334dae Mon Sep 17 00:00:00 2001
+From: Alexander Bulekov <alxndr@bu.edu>
+Date: Mon, 1 Mar 2021 14:35:30 -0500
+Subject: [PATCH 10/10] lan9118: switch to use qemu_receive_packet() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [37cee01784ff0df13e5209517e1b3594a5e792d1]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/lan9118.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
+index ab57c02c8..75f18ae2d 100644
+--- a/hw/net/lan9118.c
++++ b/hw/net/lan9118.c
+@@ -669,7 +669,7 @@ static void do_tx_packet(lan9118_state *s)
+ /* FIXME: Honor TX disable, and allow queueing of packets. */
+ if (s->phy_control & 0x4000) {
+ /* This assumes the receive routine doesn't touch the VLANClient. */
+- lan9118_receive(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
++ qemu_receive_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
+ } else {
+ qemu_send_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch
new file mode 100644
index 0000000000..5e53e20bac
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_2.patch
@@ -0,0 +1,42 @@
+From e2a48a3c7cc33dbbe89f896e0f07462cb04ff6b5 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 12:13:22 +0800
+Subject: [PATCH 02/10] e1000: switch to use qemu_receive_packet() for loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [1caff0340f49c93d535c6558a5138d20d475315c]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/e1000.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
+index d7d05ae30..cf22c4f07 100644
+--- a/hw/net/e1000.c
++++ b/hw/net/e1000.c
+@@ -546,7 +546,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size)
+
+ NetClientState *nc = qemu_get_queue(s->nic);
+ if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) {
+- nc->info->receive(nc, buf, size);
++ qemu_receive_packet(nc, buf, size);
+ } else {
+ qemu_send_packet(nc, buf, size);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_3.patch
new file mode 100644
index 0000000000..3fc469e3e3
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_3.patch
@@ -0,0 +1,43 @@
+From c041a4da1ff119715e0ccf2d4a7af62568f17b93 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 12:57:40 +0800
+Subject: [PATCH 03/10] dp8393x: switch to use qemu_receive_packet() for
+ loopback packet
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [331d2ac9ea307c990dc86e6493e8f0c48d14bb33]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/dp8393x.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
+index 205c0decc..533a8304d 100644
+--- a/hw/net/dp8393x.c
++++ b/hw/net/dp8393x.c
+@@ -506,7 +506,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
+ s->regs[SONIC_TCR] |= SONIC_TCR_CRSL;
+ if (nc->info->can_receive(nc)) {
+ s->loopback_packet = 1;
+- nc->info->receive(nc, s->tx_buffer, tx_len);
++ qemu_receive_packet(nc, s->tx_buffer, tx_len);
+ }
+ } else {
+ /* Transmit packet */
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_4.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_4.patch
new file mode 100644
index 0000000000..e14f37735d
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_4.patch
@@ -0,0 +1,43 @@
+From 9ac5345344b75995bc96d171eaa5dc8d26bf0e21 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 13:00:01 +0800
+Subject: [PATCH 04/10] msf2-mac: switch to use qemu_receive_packet() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [26194a58f4eb83c5bdf4061a1628508084450ba1]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/msf2-emac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
+index 32ba9e841..3e6206044 100644
+--- a/hw/net/msf2-emac.c
++++ b/hw/net/msf2-emac.c
+@@ -158,7 +158,7 @@ static void msf2_dma_tx(MSF2EmacState *s)
+ * R_CFG1 bit 0 is set.
+ */
+ if (s->regs[R_CFG1] & R_CFG1_LB_EN_MASK) {
+- nc->info->receive(nc, buf, size);
++ qemu_receive_packet(nc, buf, size);
+ } else {
+ qemu_send_packet(nc, buf, size);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_5.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_5.patch
new file mode 100644
index 0000000000..c3f8f97592
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_5.patch
@@ -0,0 +1,45 @@
+From d465dc79c9ee729d91ef086b993e956b1935be69 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 13:14:35 +0800
+Subject: [PATCH 05/10] sungem: switch to use qemu_receive_packet() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [8c92060d3c0248bd4d515719a35922cd2391b9b4]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/sungem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/sungem.c b/hw/net/sungem.c
+index 33c3722df..3684a4d73 100644
+--- a/hw/net/sungem.c
++++ b/hw/net/sungem.c
+@@ -306,7 +306,7 @@ static void sungem_send_packet(SunGEMState *s, const uint8_t *buf,
+ NetClientState *nc = qemu_get_queue(s->nic);
+
+ if (s->macregs[MAC_XIFCFG >> 2] & MAC_XIFCFG_LBCK) {
+- nc->info->receive(nc, buf, size);
++ qemu_receive_packet(nc, buf, size);
+ } else {
+ qemu_send_packet(nc, buf, size);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_6.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_6.patch
new file mode 100644
index 0000000000..855c6970f4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_6.patch
@@ -0,0 +1,43 @@
+From c0010f9b2bafe866fe32e3c2688454bc24147136 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 13:27:52 +0800
+Subject: [PATCH 06/10] tx_pkt: switch to use qemu_receive_packet_iov() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_receive_iov() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [8c552542b81e56ff532dd27ec6e5328954bdda73]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/net_tx_pkt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
+index da262edc3..1f9aa59ec 100644
+--- a/hw/net/net_tx_pkt.c
++++ b/hw/net/net_tx_pkt.c
+@@ -553,7 +553,7 @@ static inline void net_tx_pkt_sendv(struct NetTxPkt *pkt,
+ NetClientState *nc, const struct iovec *iov, int iov_cnt)
+ {
+ if (pkt->is_loopback) {
+- nc->info->receive_iov(nc, iov, iov_cnt);
++ qemu_receive_packet_iov(nc, iov, iov_cnt);
+ } else {
+ qemu_sendv_packet(nc, iov, iov_cnt);
+ }
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch
new file mode 100644
index 0000000000..4e1115de02
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_7.patch
@@ -0,0 +1,45 @@
+From 64b38675c728354e4015e4bec3d975cd4cb8a981 Mon Sep 17 00:00:00 2001
+From: Alexander Bulekov <alxndr@bu.edu>
+Date: Fri, 26 Feb 2021 13:47:53 -0500
+Subject: [PATCH 07/10] rtl8139: switch to use qemu_receive_packet() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Buglink: https://bugs.launchpad.net/qemu/+bug/1910826
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [5311fb805a4403bba024e83886fa0e7572265de4]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/rtl8139.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
+index ba5ace1ab..d2dd03e6a 100644
+--- a/hw/net/rtl8139.c
++++ b/hw/net/rtl8139.c
+@@ -1795,7 +1795,7 @@ static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size,
+ }
+
+ DPRINTF("+++ transmit loopback mode\n");
+- rtl8139_do_receive(qemu_get_queue(s->nic), buf, size, do_interrupt);
++ qemu_receive_packet(qemu_get_queue(s->nic), buf, size);
+
+ if (iov) {
+ g_free(buf2);
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_8.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_8.patch
new file mode 100644
index 0000000000..ed716468dc
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_8.patch
@@ -0,0 +1,44 @@
+From 023ce62f0a788ad3a8233c7a828554bceeafd031 Mon Sep 17 00:00:00 2001
+From: Alexander Bulekov <alxndr@bu.edu>
+Date: Mon, 1 Mar 2021 10:33:34 -0500
+Subject: [PATCH 08/10] pcnet: switch to use qemu_receive_packet() for loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Buglink: https://bugs.launchpad.net/qemu/+bug/1917085
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/pcnet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
+index f3f18d859..dcd3fc494 100644
+--- a/hw/net/pcnet.c
++++ b/hw/net/pcnet.c
+@@ -1250,7 +1250,7 @@ txagain:
+ if (BCR_SWSTYLE(s) == 1)
+ add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS);
+ s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC;
+- pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
++ qemu_receive_packet(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
+ s->looptest = 0;
+ } else {
+ if (s->nic) {
+--
+2.29.2
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_9.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_9.patch
new file mode 100644
index 0000000000..39d32b33a4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3416_9.patch
@@ -0,0 +1,46 @@
+From ecf7e62bb2cb02c9bd40082504ae376f3e19ffd2 Mon Sep 17 00:00:00 2001
+From: Alexander Bulekov <alxndr@bu.edu>
+Date: Mon, 1 Mar 2021 14:33:43 -0500
+Subject: [PATCH 09/10] cadence_gem: switch to use qemu_receive_packet() for
+ loopback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch switches to use qemu_receive_packet() which can detect
+reentrancy and return early.
+
+This is intended to address CVE-2021-3416.
+
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [e73adfbeec9d4e008630c814759052ed945c3fed]
+CVE: CVE-2021-3416
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/cadence_gem.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
+index 7a534691f..43b760e3f 100644
+--- a/hw/net/cadence_gem.c
++++ b/hw/net/cadence_gem.c
+@@ -1275,8 +1275,8 @@ static void gem_transmit(CadenceGEMState *s)
+ /* Send the packet somewhere */
+ if (s->phy_loop || (s->regs[GEM_NWCTRL] &
+ GEM_NWCTRL_LOCALLOOP)) {
+- gem_receive(qemu_get_queue(s->nic), s->tx_packet,
+- total_bytes);
++ qemu_receive_packet(qemu_get_queue(s->nic), s->tx_packet,
++ total_bytes);
+ } else {
+ qemu_send_packet(qemu_get_queue(s->nic), s->tx_packet,
+ total_bytes);
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 63/64] qemu: fix CVE-2021-20257
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (61 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 62/64] qemu: fix CVE-2021-3416 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 64/64] go: Use dl.google.com for SRC_URI Anuj Mittal
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 547ac986a74cfcae39b691ebb92aadc8436443ea)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2021-20257.patch | 55 +++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20257.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 177e453fff..5797bbecf2 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -53,6 +53,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2021-3416_8.patch \
file://CVE-2021-3416_9.patch \
file://CVE-2021-3416_10.patch \
+ file://CVE-2021-20257.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20257.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20257.patch
new file mode 100644
index 0000000000..7175b24e99
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20257.patch
@@ -0,0 +1,55 @@
+From affdf476543405045c281a7c67d1eaedbcea8135 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Wed, 24 Feb 2021 13:45:28 +0800
+Subject: [PATCH] e1000: fail early for evil descriptor
+
+During procss_tx_desc(), driver can try to chain data descriptor with
+legacy descriptor, when will lead underflow for the following
+calculation in process_tx_desc() for bytes:
+
+ if (tp->size + bytes > msh)
+ bytes = msh - tp->size;
+
+This will lead a infinite loop. So check and fail early if tp->size if
+greater or equal to msh.
+
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Reported-by: Cheolwoo Myung <cwmyung@snu.ac.kr>
+Reported-by: Ruhr-University Bochum <bugs-syssec@rub.de>
+Cc: Prasad J Pandit <ppandit@redhat.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+Upstream-Status: Backport [3de46e6fc489c52c9431a8a832ad8170a7569bd8]
+CVE: CVE-2021-20257
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ hw/net/e1000.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
+index cf22c4f07..c3564c7ce 100644
+--- a/hw/net/e1000.c
++++ b/hw/net/e1000.c
+@@ -670,6 +670,9 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+ msh = tp->tso_props.hdr_len + tp->tso_props.mss;
+ do {
+ bytes = split_size;
++ if (tp->size >= msh) {
++ goto eop;
++ }
+ if (tp->size + bytes > msh)
+ bytes = msh - tp->size;
+
+@@ -695,6 +698,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+ tp->size += split_size;
+ }
+
++eop:
+ if (!(txd_lower & E1000_TXD_CMD_EOP))
+ return;
+ if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) {
+--
+2.29.2
+
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
* [hardknott][PATCH 64/64] go: Use dl.google.com for SRC_URI
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
` (62 preceding siblings ...)
2021-04-26 0:53 ` [hardknott][PATCH 63/64] qemu: fix CVE-2021-20257 Anuj Mittal
@ 2021-04-26 0:53 ` Anuj Mittal
63 siblings, 0 replies; 65+ messages in thread
From: Anuj Mittal @ 2021-04-26 0:53 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
golang.org/dl is resolving to this anyway
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8470e38ac1d9f9bb6d8a4ee43724af452d080057)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/go/go-common.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index 39a681a712..c368b95b69 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -14,7 +14,7 @@ LICENSE = "BSD-3-Clause"
inherit goarch
-SRC_URI = "https://golang.org/dl/go${PV}.src.tar.gz;name=main"
+SRC_URI = "https://dl.google.com/go/go${PV}.src.tar.gz;name=main"
S = "${WORKDIR}/go"
B = "${S}"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
--
2.30.2
^ permalink raw reply related [flat|nested] 65+ messages in thread
end of thread, other threads:[~2021-04-26 0:56 UTC | newest]
Thread overview: 65+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-26 0:49 [hardknott][PATCH 00/64] review request Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 01/64] lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9) Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 02/64] pseudo: Upgrade to add trailing slashes ignore path fix Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 03/64] oeqa/selftest: Ensure packages classes are set correctly for maintainers test Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 04/64] qemu: Fix CVE-2020-35517 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 05/64] archiver: Fix typos Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 06/64] busybox: fix CVE-2021-28831 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 07/64] linux-yocto/5.4: update to v5.4.109 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 08/64] linux-yocto/5.10: update to v5.10.27 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 09/64] linux-yocto-dev: add features/scsi/scsi-debug.scc features/gpio/mockup.scc to KERNEL_FEATURES Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 10/64] linux-yocto/5.10: BSP configuration fixes Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 11/64] linux-yocto/5.10: update to v5.10.29 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 12/64] linux-yocto/5.4: update to v5.4.111 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 13/64] linux-yocto/5.10: update to v5.10.30 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 14/64] linux-yocto-rt/5.10: update to -rt34 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 15/64] linux-yocto/5.4: update to v5.4.112 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 16/64] linux-yocto/5.4: fix arm defconfig warnings Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 17/64] linux-yocto/5.10: " Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 18/64] nettle: upgrade 3.7.1 -> 3.7.2 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 19/64] ca-certificates: Fix openssl runtime cert dependencies Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 20/64] scripts/oe-debuginfod: correct several issues Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 21/64] oe-time-dd-test.sh: increase timeout to 15 sec Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 22/64] oeqa/runtime/cases: Only disable/enable for current boot Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 23/64] python3: Upgrade 3.9.2 -> 3.9.4 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 24/64] python3: Improve logging, syntax and update deprecated modules to create_manifest Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 25/64] systemd: Fix build on mips/musl Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 26/64] mesa: upgrade 21.0.1 -> 21.0.2 Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 27/64] go: update SRC_URI to use https protocol Anuj Mittal
2021-04-26 0:52 ` [hardknott][PATCH 28/64] parselogs: ignore floppy error on qemu-system-x86 at boot stage Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 29/64] oeqa/runtime: space needed Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 30/64] groff: not ship /usr/bin/grap2graph Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 31/64] sanity: Add error check for '%' in build path Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 32/64] insane: clean up some more warning messages Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 33/64] systemd: upgrade 247.4 -> 247.6 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 34/64] modutils-initscripts: Bail out when no module is installed Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 35/64] sysvinit-inittab/start_getty: Check /sys for the tty device existence Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 36/64] Revert "inittab: Add getty launch on hvc0 for qemuppc64" Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 37/64] libtool: make sure autoheader run before automake Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 38/64] kmod: do not symlink config.guess/config.sub during autoreconf Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 39/64] pango: re-enable ptest Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 40/64] go: upgrade 1.16.2 -> 1.16.3 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 41/64] glslang: strip whitespace in pkgconfig file Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 42/64] ltp: fix empty ltp-dev package Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 43/64] packagegroup-core-tools-profile: Remove valgrind for riscv32 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 44/64] packagegroup-core-tools-testapps.bb: Remove kexec " Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 45/64] libxshmfence: Build fixes " Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 46/64] arch-armv6m.inc: fix access rights Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 47/64] Revert "externalsrc: Detect code changes in submodules" Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 48/64] externalsrc: Detect code changes in submodules Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 49/64] deb: apply postinstall on sdk Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 50/64] wpa-supplicant: fix CVE-2021-30004 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 51/64] lttng-tools: Fix missing legacy test files Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 52/64] lttng-tools: Fix path for test_python_looging Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 53/64] cairo: fix CVE-2020-35492 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 54/64] gdk-pixbuf: fix CVE-2021-20240 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 55/64] runqemu: Ensure we cleanup snapshot files after image run Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 56/64] rpm: Upgrade to 4.16.1.3 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 57/64] cve-update-db-native: skip on empty cpe23Uri Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 58/64] qemu: fix CVE-2021-20181 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 59/64] qemu: fix CVE-2020-29443 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 60/64] qemu: fix CVE-2021-20221 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 61/64] qemu: fix CVE-2021-3409 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 62/64] qemu: fix CVE-2021-3416 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 63/64] qemu: fix CVE-2021-20257 Anuj Mittal
2021-04-26 0:53 ` [hardknott][PATCH 64/64] go: Use dl.google.com for SRC_URI Anuj Mittal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.