summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2022-09-30 21:13:31 +0300
committerAndrew Geissler <andrew@geissonator.com>2022-10-03 05:08:14 +0300
commit87f5cff0cfca11f43851cb3d7d49dd96ced7fe03 (patch)
tree5a748b271a6f682219155ce8292ca034c1b0411c /poky/meta/recipes-devtools/qemu
parent251ad11cced0e148ba7529369597bf1d8d851032 (diff)
downloadopenbmc-87f5cff0cfca11f43851cb3d7d49dd96ced7fe03.tar.xz
subtree updates
meta-raspberrypi: c57b464b88..45d56d82b7: Andrei Gherzan (8): linux-firmware-rpidistro: Fix wireless on Raspberry Pi 4 sdcard_image-rpi.bbclass: Move SDIMG_KERNELIMAGE definitions to their machines raspberrypi0-2w.conf: Include the RPi 0-2w dtb for all 32-bit machines rpi-base.inc: Split IMAGE_BOOT_FILES for kernel image Add support for a ARMv7 machine supporting multiple Raspberry Pi boards ci: Add raspberrypi-armv7 to the build matrix Add support for a ARMv8 machine supporting multiple Raspberry Pi boards ci: Add raspberrypi-armv8 to the build matrix Chris Blättermann (1): meta-raspberrypi: Include the device tree for Raspberry Pi CM4S Khem Raj (2): rpidistro-vlc,rpidistro-ffmpeg: Limit scope to just rpi machines layers: Add langdale to LAYERSERIES_COMPAT Vincent Davis Jr (4): raspidistro-ffmpeg: add support for building raspidistro ffmpeg rpidistro-vlc: add rpidistro VLC build (with MMAL enabled) Add support for optional selection of vlc and ffmpeg docs: add info for raspberrypi distro vlc Vinicius Aquino (1): raspberrypi-firmware: Update to 20220830 snapshot meta-openembedded: a755af4fb5..0782ea454a: Adrian Freihofer (1): networkmanager: update 1.38.0 -> 1.40.0 Alejandro Enedino Hernandez Samaniego (1): emacs: Update to version 28.2 Alex Kiernan (2): libcoap: Fix gnutls/openssl/mbedtls PACKAGECONFIG conflicts libcoap: Upgrade 4.3.0 -> 4.3.1 Alexander Kanavin (7): mozjs-91: update to 91.13.0 collectd: add a python PACKAGECONFIG, off by default zbar: disable python3 support as incompatible with py 3.11 libsigrockdecode: add python 3.11 compatibility minifi-cpp: disable python support as incompatible with python 3.11 mozjs-91: backport a python 3.11 compatibility patch mozjs-78: remove the recipe Andreas Müller (1): octave: upgrade 7.1.0 -> 7.2.0 Andrej Kozemcak (1): squid: upgrade 4.15 -> 5.7 Andres Beltran (1): Make graph dependencies optional Bernhard Messerklinger (1): libconfig-tiny-perl: add recipe Chen Qi (2): passwdqc: fix the libpasswdqc FILES setting polkit: refresh patch Frank de Brabander (1): ntp: add missing runtime dependency on libgcc for sntp Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.36 -> 6.1.38 Hitendra Prajapati (1): wireshark: CVE-2022-3190 Infinite loop in legacy style dissector Howard Cochran (1): ufw: Fix "could not find required binary 'iptables'" Ivan Maidanski (1): bdwgc: Fix typo in EXTRA_OECONF and remove unneeded extra CFLAGS Jan Vermaete (1): makeself: upate anonymous git access and dropped man page. Khem Raj (140): gtk+: Fix function signature of create_menu() ippool: Fix build with clang15 corosync: Upgrade to 3.1.6 dlm: Upgrade to 4.1.1 dante: Upgrade to 1.4.3 ez-ipupdate: Fix build with clang openflow: Include sys/stat.h for fchmod nautilus: Backport a patch to fix build with clang-15 mctp: Update to latest tip of trunk ypbind-mt: Upgrade to 2.7.2 packagegroup-meta-networking: Remove ypbind-mt on musl fping: Fix build with musl iscsi-initiator-utils: Upgrade to 2.1.7 radvd: Fix build on musl linux-atm: Include missing string.h memcached: Upgrade to 1.6.17 openlldp: Upgrade to 1.1.0 ettercap: Pass -D_GNU_SOURCE rdma-core: Fix build with musl openl2tp: Provide prototype for l2tp_api_rpc_check_request iscsi-initiator-utils: Avoid hardcoding sed to /usr/bin/sed toybox: Remove mount.h conflict fix libuser: Upgrade to 0.63 gnome-keyring: Upgrade to 42.1 folks: Disable LTO and implicit-function-declaration as error libgtop: Fix build with clang ot-daemon,ot-br-posix: Fix mbedtls module builds libcurses-perl: Fix main prototype in testtyp.c rasdaemon: Upgrade to 0.6.8 psqlodbc: Upgrade to 13.02.0000 soci: Fix build with clang 15 geany-plugins: Fix type error found with clang 15 nlohmann-fifo: Update to tip of trunk xfce4-dev-tools: Fix configure check for libX11 frr: Fix configure check for libreadline quagga: Fix AC_CHECK_LIB for libreadline libutempter: Upgrade to 1.2.2-alt1 libuio: Update to latest tip of trunk serial-forward: Correct typo in specifying string.h header mcelog: Upgrade to v189 fvwm: Disable int-conversion and implicit-int warnings as errors hddtemp: Add missing prototype for ata_get_powermode in sata.c nana: Include stdlib.h form exit() and abort() functions libsmi: Fix build with clang 15 ckermit: Fix build with clang linuxptp: Include string.h for strncpy() wifi-test-suite: Fix build with clang xf86-video-nouveau: Do not treat implicit-function-declaration as error android-tools: Add protoype declaration for b64_pton libio-pty-perl: Fix build on musl xrdp: Fix build with clang-15 libpwquality: Do not use fgetpwent_r on musl lmbench: Add patch to fix typo including string.h header lxdm: Fix msghdr initialization on musl zabbix: Upgrade to 6.2.2 epeg: Fix AC_CHECK_LIB for libjpeg and libexif gensio: Fix AC_CHECK_LIB for libwrap pam-plugin-ccreds: Fix AC_CHECK_LIB for libdb sblim-sfcb: Fix AC_CHECK_LIB tests for various libraries rdfind: Fix AC_CHECK_LIB for libnettle srecord: Fix AC_CHECK_LIB for gpg-error tokyocabinet: Fix AC_CHECK_LIB test functions libcereal: Do not use uniform_int_distribution<char> template raptor2: Match reutrn type from RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE pam-ssh-agent-auth: Fix __progname configure check daemontools: Fix build with clang15 and musl pmtools: Update patch to include string.h and function prototype for main uw-imap: Fix build with clang/musl libx86: Fix pointer typecasting in assignment obconf: Add fixes for missing function prototypes sblim-sfcc: Fix build with clang sblim-sfcb: Add missing headers file for clang/musl sanlock: Add missing prototype for mem* functions geis: Add missing prototypes to functions libgxim: Enable debug mode hplip: Upgrade to 3.22.6 scsirastools: Pass -D_LARGEFILE64_SOURCE via CFLAGS con2fbmap: Include string.h for strerror directfb-examples: Fix pthread_t assignment type uml-utilities: Add missing headers for exit and str+ functions oprofile: Fix configure check for perf_events support libmcrypt: Suppress implicit-int warnings as errors gtkperf: Define prototype for setup_appdata cyrus-sasl: Fix time.h detection logic in configure enscript: Include string.h form str* function prototypes glm: Disable clang specific warnings mg: Upgrade to 20220614 release gphoto2: Upgrade to 2.5.28 ipmiutil: Add missing headers for protypes of free/malloc/atoi cdrkit: Add missing header for function prototypes fluentbit: Drop redundant patch minifi-cpp: Disable gnu extention of strerror_r when using musl augeas: Check for __GLIBC__ to use gnu extention for strerror_r nlohmann-fifo: Disable cpp11 shuffle with clang/libc++ ipmitool: Update to 1.8.19 autofs: Backport innetgr and strerror_r musl patches linux-atm: Remove AC_CHECK_LIB for libresolv hdf5: Upgrade to 1.13.2 openldap: Fix configure check for pthread_detach libimobiledevice: Explicitly pass -D_GNU_SOURCE via cflags jq: Upgrade to latest and fix configure tests lcdproc: Fix build on non-x86 and arm architectures libsmi: Define _DEFAULT_SOURCE for timegm API tftp-hpa: Fix includes for bsd_signal() sblim-sfcb: Include config.h before using CONFIG_ERROR_H minifi-cpp: Disable lto. ntp: Fix check for pthread_detach netkit-telnet: Add time.h from strftime/time prototypes passwdqc: Upgrade to 2.0.2 lmbench: Fix build time tests and use the scripts/build mcpp: Fix build with clang ot-br-posix: Fix unused variable error sthttpd: Define _GNU_SOURCE if HAVE_SIGSET is set libesmtp: Enable gnu strerror_r on glibc android-tools: Use local strlcpy implementation on glibc uw-imap: Avoid programs using gets() matplotlib: Upgrade to 3.5.3 cockpit: Update to 276 geary: Fix build with clang toybox: Fix build on 32bit arches with 64bit time_t defaults libcdio: Define _LARGEFILE64_SOURCE rocksdb: Upgrade to 7.5.3 release fwupd: Upgrade to 1.8.4 luajit: Use builtin for __clear_cache on clang kexec-tools-klibc: Fix type mismatch in calls to dtb_set_initrd on mips minifi-cpp: Fix build on musl aom: Provide missing function prototypes vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively python3-lxml: Delete fwupd: Fix tostring() call to not have xml_declaration param sox: Enable -D_FILE_OFFSET_BITS=64 and depend on libtool rdfind: Fix patch-fuzz warnings fwupd: Drop sqlite3 from default deps sqlite: Drop sqlite2 recipe wvstreams: Add missing dependency on boost jack: Upgrade to 1.19.21 python3-grpcio-tools: Disable clang's musttail attribute on mips fwupd: Replace python3.7 patch with upstreamed one mdio-tools,mdio-netlink: Upgrade recipes to 1.2.0 python3-requests-unixsocket: Fix override syntax Lei Maohui (5): fltk: Fix buildpaths warning. exiv2: Fix buildpaths warning. tracker-miners: Fix buildpaths warning. gexiv2: Fix buildpaths warning. mariadb: Fix buildpaths warning. Leon Anavi (24): python3-imageio: Upgrade 2.21.1 -> 2.21.2 python3-prompt-toolkit: Upgrade 3.0.30 -> 3.0.31 python3-haversine: Upgrade 2.6.0 -> 2.7.0 python3-transitions: Upgrade 0.8.11 -> 0.9.0 python3-astroid: Upgrade 2.12.5 -> 2.12.9 python3-imageio: Upgrade 2.21.2 -> 2.21.3 python3-portion: Upgrade 2.2.0 -> 2.3.0 python3-networkx: Upgrade 2.8.5 -> 2.8.6 python3-prettytable: Upgrade 3.3.0 -> 3.4.1 python3-pydantic: Upgrade 1.9.1 -> 1.10.2 python3-soupsieve: Upgrade 2.3.1 -> 2.3.2.post1 python3-awesomeversion: Upgrade 22.8.0 -> 22.9.0 python3-ujson: Upgrade 5.4.0 -> 5.5.0 python3-marshmallow: Upgrade 3.17.1 -> 3.18.0 python3-elementpath: Upgrade 3.0.1 -> 3.0.2 python3-traitlets: Upgrade 5.3.0 -> 5.4.0 python3-joblib: Upgrade 1.1.0 -> 1.2.0 python3-astroid: Upgrade 2.12.9 -> 2.12.10 python3-imageio: Upgrade 2.21.3 -> 2.22.0 python3-email-validator: Upgrade 1.2.1 -> 1.3.0 python3-termcolor: Upgrade 1.1.0 -> 2.0.1 python3-aiohttp: Upgrade 3.8.1 -> 3.8.3 python3-pytz-deprecation-shim: Runtime dependencies python3-license-expression: Upgrade 21.6.14 -> 30.0.0 Luca Boccassi (1): dbus-broker: update to v32 Markus Volk (4): pipewire: update 0.3.56 -> 0.3.57 flatbuffers: upgrade 2.0.6 -> 2.0.8 appstream-glib: fix manpage generation jansson: use cmake instead of autotools Martin Jansa (2): lvm2: use bfd even with ld-is-gold in DISTRO_FEATURES libcec: fix runtime dependencies for ${PN}-examples Ming Liu (1): libusbgx: add PACKAGECONFIG to make build predicable Mingli Yu (2): python3-pyzmq: Fix buildpaths issue python3-pyzmq: Add RDEPENDS for python3-pyzmq-ptest Naveen Saini (1): ocl-icd: add nativesdk support Ovidiu Panait (1): redis: build with USE_SYSTEMD=yes when systemd is enabled Patrick Williams (1): unifex: remove recipe Philippe Coval (3): lvgl: Add dialog-lvgl recipe as demo example pim435: Relocate sources to eclipse ot-br-posix: Add dep to ipset as used by firewall Riyaz Khan (2): sdbus-c++: Upgrade sdbus-c++ 1.1.0 to 1.2.0 sdbus-c++-tools: Upgrade sdbus-c++-tools 1.1.0 to 1.2.0 Sergio Prado (1): polkit: refresh patch to fix warning Steffen Olsen (1): postgreql: Fix pg_config not working after buildpaths patch Vincent Davis Jr (1): cglm: New recipe for cglm-0.8.5 Wang Mingyu (16): abseil-cpp: upgrade 20220623.0 -> 20220623.1 chrony: upgrade 4.2 -> 4.3 ctags: upgrade 5.9.20220821.0 -> 5.9.20220828.0 fio: upgrade 3.31 -> 3.32 libblockdev: upgrade 2.26 -> 2.27 libdev-checklib-perl: upgrade 1.14 -> 1.16 lvm2/libdevmapper: upgrade 2.03.11 -> 2.03.16 libforms: upgrade 1.2.3 -> 1.2.4 python3-astroid: upgrade 2.12.4 -> 2.12.5 python3-colorlog: upgrade 6.6.0 -> 6.7.0 python3-django: upgrade 3.2.12 -> 4.1 python3-google-api-core: upgrade 2.8.2 -> 2.10.0 python3-google-api-python-client: upgrade 2.57.0 -> 2.58.0 python3-grpcio: upgrade 1.48.0 -> 1.48.1 python3-grpcio-tools: upgrade 1.48.0 -> 1.48.1 cli11: upgrade 1.9.1 -> 2.2.0 Xu Huan (5): python3-greenlet: upgrade 1.1.2 -> 1.1.3 python3-marshmallow: upgrade 3.17.0 -> 3.17.1 python3-pyudev: upgrade 0.23.2 -> 0.24.0 python3-websocket-client: upgrade 1.3.3 -> 1.4.0 python3-xmlschema: upgrade 2.0.2 -> 2.0.3 Yi Zhao (1): tcpreplay: fix buildpaths issue Zheng Qiu (2): jq: add ptest rsyslog: update 8.2206->8.2208 hongxu (1): python3-h5py: fix wrong file driver version wangmy (78): fuse3: upgrade 3.11.0 -> 3.12.0 xfstests: upgrade 2022.08.07 -> 2022.08.21 gnome-bluetooth: upgrade 42.3 -> 42.4 libadwaita: upgrade 1.1.4 -> 1.1.5 networkmanager-openvpn: upgrade 1.8.18 -> 1.10.0 open-isns: upgrade 0.101 -> 0.102 boost-sml: upgrade 1.1.5 -> 1.1.6 ctags: upgrade 5.9.20220828.0 -> 5.9.20220904.0 hwdata: upgrade 0.361 -> 0.362 modemmanager: upgrade 1.18.10 -> 1.18.12 php: upgrade 8.1.9 -> 8.1.10 poppler: upgrade 22.08.0 -> 22.09.0 syslog-ng: upgrade 3.37.1 -> 3.38.1 libio-socket-ssl-perl: upgrade 2.074 -> 2.075 python3-aiofiles: upgrade 0.8.0 -> 22.1.0 python3-antlr4-runtime: upgrade 4.10 -> 4.11.1 python3-croniter: upgrade 1.3.5 -> 1.3.7 python3-google-api-python-client: upgrade 2.58.0 -> 2.60.0 python3-langtable: upgrade 0.0.58 -> 0.0.59 python3-oauthlib: upgrade 3.2.0 -> 3.2.1 python3-pymetno: upgrade 0.9.0 -> 0.10.0 python3-sqlalchemy: upgrade 1.4.40 -> 1.4.41 python3-twisted: upgrade 22.4.0 -> 22.8.0 python3-websocket-client: upgrade 1.4.0 -> 1.4.1 python3-xmlschema: upgrade 2.0.3 -> 2.0.4 libadwaita: upgrade 1.1.5 -> 1.2.0 bats: upgrade 1.7.0 -> 1.8.0 ctags: upgrade 5.9.20220904.0 -> 5.9.20220911.0 iceauth: upgrade 1.0.8 -> 1.0.9 iwd: upgrade 1.29 -> 1.30 libblockdev: upgrade 2.27 -> 2.28 libjcat: upgrade 0.1.11 -> 0.1.12 libpfm4: upgrade 4.11.0 -> 4.12.0 libxmlb: upgrade 0.3.9 -> 0.3.10 neon: upgrade 0.32.2 -> 0.32.4 setxkbmap: upgrade 1.3.2 -> 1.3.3 xclock: upgrade 1.0.9 -> 1.1.1 xkbutils: upgrade 1.0.4 -> 1.0.5 xlsfonts: upgrade 1.0.6 -> 1.0.7 xmag: upgrade 1.0.6 -> 1.0.7 xwud: upgrade 1.0.5 -> 1.0.6 python3-cachecontrol: upgrade 0.12.11 -> 0.12.12 python3-cantools: upgrade 37.1.2 -> 37.2.0 python3-eth-typing: upgrade 3.1.0 -> 3.2.0 python3-fasteners: upgrade 0.17.3 -> 0.18 python3-flask-socketio: upgrade 5.3.0 -> 5.3.1 python3-google-api-core: upgrade 2.10.0 -> 2.10.1 python3-google-api-python-client: upgrade 2.60.0 -> 2.61.0 python3-grpcio-tools: upgrade 1.48.1 -> 1.49.0 python3-grpcio: upgrade 1.48.1 -> 1.49.0 python3-jsonrpcserver: upgrade 5.0.8 -> 5.0.9 python3-protobuf: upgrade 4.21.5 -> 4.21.6 xfstests: upgrade 2022.08.21 -> 2022.09.04 gnome-font-viewer: upgrade 42.0 -> 43.0 tracker: upgrade 3.3.3 -> 3.4.0 yelp-xsl: upgrade 42.0 -> 42.1 dnsmasq: upgrade 2.86 -> 2.87 unbound: upgrade 1.16.2 -> 1.16.3 cairomm-1.16: upgrade 1.16.1 -> 1.16.2 ctags: upgrade 5.9.20220911.0 -> 5.9.20220925.0 libgee: upgrade 0.20.5 -> 0.20.6 libpeas: upgrade 1.32.0 -> 1.34.0 opencl-headers: upgrade 2022.05.18 -> 2022.09.23 pangomm-2.48: upgrade 2.50.0 -> 2.50.1 thrift: upgrade 0.16.0 -> 0.17.0 zabbix: upgrade 6.2.2 -> 6.2.3 python3-djangorestframework: upgrade 3.13.1 -> 3.14.0 python3-google-api-python-client: upgrade 2.61.0 -> 2.62.0 python3-google-auth: upgrade 2.11.0 -> 2.11.1 python3-grpcio-tools: upgrade 1.49.0 -> 1.49.1 python3-grpcio: upgrade 1.49.0 -> 1.49.1 python3-h11: upgrade 0.13.0 -> 0.14.0 python3-humanize: upgrade 4.3.0 -> 4.4.0 python3-langtable: upgrade 0.0.59 -> 0.0.60 python3-ldap: upgrade 3.4.2 -> 3.4.3 python3-pandas: upgrade 1.4.4 -> 1.5.0 python3-path: upgrade 16.4.0 -> 16.5.0 python3-xmlschema: upgrade 2.0.4 -> 2.1.0 zhengrq.fnst (8): python3-astroid: upgrade 2.12.2 -> 2.12.4 python3-flatbuffers: upgrade 2.0.6 -> 2.0.7 python3-flask-socketio: upgrade 5.2.0 -> 5.3.0 python3-gnupg: upgrade 0.4.9 -> 0.5.0 python3-natsort: upgrade 8.1.0 -> 8.2.0 python3-sympy: upgrade 1.10.1 -> 1.11.1 python3-pandas: upgrade 1.4.3 -> 1.4.4 python3-parsimonious: upgrade 0.9.0 -> 0.10.0 zhengruoqin (15): wolfssl: upgrade 5.4.0 -> 5.5.0 ser2net: upgrade 4.3.7 -> 4.3.8 tree: upgrade 2.0.3 -> 2.0.4 xorgxrdp: upgrade 0.2.18 -> 0.9.19 python3-zeroconf: upgrade 0.39.0 -> 0.39.1 smarty: upgrade 4.2.0 -> 4.2.1 python3-pycocotools: upgrade 2.0.4 -> 2.0.5 python3-pyproj: upgrade 3.3.1 -> 3.4.0 python3-pyzmq: upgrade 23.2.1 -> 24.0.0 python3-regex: upgrade 2022.8.17 -> 2022.9.13 python3-pyjwt: upgrade 2.4.0 -> 2.5.0 python3-pyscaffold: upgrade 4.3 -> 4.3.1 python3-pyzmq: upgrade 24.0.0 -> 24.0.1 python3-sqlparse: upgrade 0.4.2 -> 0.4.3 python3-web3: upgrade 5.30.0 -> 5.31.0 meta-security: 10fdc2b13a..824d2762f6: Armin Kuster (4): suricata: fix compile issue cryptmount: fix systemd service install update sssd to 2.7.4 update chipsec to 1.8.8 poky: 9b1db65e7d..5200799866: Alejandro Hernandez Samaniego (1): rootfs.py: dont try to list installed packages for baremetal images Alexander Kanavin (15): selftest/cases/bblayers.py: build python3-jsonschema only once oe-setup-builddir: do not suggest local.conf as a source of examples init-system-helpers: exclude experimental tags from version check ref-manual: correct the location of default configuration template dev-manual: common-tasks.rst: drop the output of 'bitbake-layers --help' common-tasks.rst: describe the layer setup tooling dev-manual: common-tasks.rst: describe the newly added layer setup and template config commands dev-manual: common-tasks.rst: rewrite the section about configuration templates github-releases: add a class that consolidates version checks meta: fix version checks in all github recipes using the github-releases class virglrenderer: use https for fetching from gitlab local.conf.sample: correct the location of public hashserv scripts/oe-setup-builddir: do not read TEMPLATECONF from templateconf.cfg rpm: update 4.18.0-rc1 -> 4.18.0-release tzdata: update to 2022d Alexandre Belloni (2): runqemu: display host uptime when starting oeqa/runtime/dnf: fix typo Andrei Gherzan (6): depmodwrapper-cross: Take into consideration kernel package name kernel.bbclass: Pass the kernel package name to depmodwrapper kernel-module-split.bbclass: Pass the kernel package name to depmodwrapper rootfs.py: Run depmod(wrapper) against each compiled kernel rootfs.py: Drop FAKEROOT support in exec function grub: Allow build on armv7ve/a with softfp Aryaman Gupta (1): bitbake: doc: bitbake-user-manual: Add definition for BB_PRESSURE_MAX variables Bob Henz (1): systemd-systemctl: Fix WantedBy processing Bruce Ashfield (11): linux-yocto/5.15: update to v5.15.63 linux-yocto/5.19: update to v5.19.5 linux-yocto/5.19: update to v5.19.7 linux-yocto/5.15: update to v5.15.65 kern-tools: fix queue processing in relative TOPDIR configurations kern-tools: allow 'y' or 'm' to avoid config audit warnings linux-yocto/5.19: update to v5.19.9 linux-yocto/5.15: update to v5.15.68 linux-yocto/5.19: cfg: fix ACPI warnings for -tiny linux-yocto/5.15: cfg: fix ACPI warnings for -tiny linux-yocto/5.19: fix gcc-11 warning Changhyeok Bae (2): iproute2: Unset CLEANBROKEN iproute2: merge .inc into .bb Changqing Li (1): parselogs.py: ignore systemd-logind warning message Chen Qi (2): shadow-securetty: allow ttyS4 for amd-snowyowl-64 useradd-example: do not use unsupported clear text password Daniel Gomez (3): rootfs-postcommands: Remove dropbear inconsistent comment gtk-icon-cache: Fix GTKIC_CMD if-else condition dropbear: Add enable-x11-forwarding PACKAGECONFIG option Daniel McGregor (2): coreutils: add openssl PACKAGECONFIG gcc: set the default target arch Denys Dmytriyenko (1): glibc-locale: explicitly remove empty dirs in ${libdir} Dmitry Baryshkov (2): linux-firmware: upgrade 20220708 -> 20220913 linux-firmware: package new Qualcomm firmware Etienne Cordonnier (2): python3: add PACKAGECONFIG[editline] opkg: add option for zstd support Fabio Estevam (1): README.hardware.md: Fix the tftp example Florin Diaconescu (1): expat: upgrade 2.4.8 -> 2.4.9 He Zhe (2): lttng-tools: Disable on qemuriscv32 lttng-tools: Disable on riscv32 Johan Korsnes (1): ref-manual: variables: document KERNEL_IMAGETYPES John Edward Broadbent (1): externalsrc: git submodule--helper list unsupported Jose Quaresma (2): bitbake: lib/bb: warning when the debug message is invalid bitbake: fetch2/crate fixup c212b0f3 loglevel Joshua Watt (2): oeqa: qemurunner: Report UNIX Epoch timestamp on login bitbake: bitbake: Fix a few more logger debug() calls Kai Kang (2): binutils: handle symlink files for gprofng binutils: another way to clear GPROFNG_ALTS for clang and musl Khem Raj (20): autoconf: Update K & R stype functions webkitgtk: Update to 2.6.37 rust: Use variable to specify extra tools to install boost: Refrain bjam from poking into host includes gobject-introspection: Do not hardcode objdump name binutils-cross-canadian: Do not package gprofng.rc webkitgtk: Fix build on 32bit arm python3-lxml: Add recipe bitbake.conf: Define TC_CXX_RUNTIME rust: Use libc++ runtime when using clang with llvm runtime glibc: Upgrade to tip of 2.36 branch binutils: Ignore CVE-2022-38126 CVE-2022-38127 inetutils: Fix remote DoS vulnerability in inetutils-telnetd curl: Add missing perl modules in ptest rdepends elfutils: Enable ptests on musl targets grub: Apply backports to fix build with clang on x86 apt: Fix type mismatches and ptest builds linux-yocto: Enable mdio for qemu gcompat: Add __getauxval wrapper needed on aarch64 ref-manual: Define TC_CXX_RUNTIME Konrad Weihmann (1): python3-idna: migrate to flit-core Kristian Amlie (1): externalsrc: Don't wipe out src dir when EXPORT_FUNCTIONS is used. Leon Anavi (1): python3-manifest.json: Add zoneinfo Markus Volk (5): squashfs-tools: build with lzo support libsdl2: update 2.0.22 -> 2.24.0 libdrm: upgrade 2.4.112 -> 2.4.113 mesa: upgrade 22.1.6 -> 22.2.0 virglrenderer: upgrade 0.9.1 -> 0.10.3 Martin Jansa (3): webkitgtk: fix gstreamer include paths libxml2: Port gentest.py to Python-3 create-pull-request: don't switch the git remote protocol to git:// Mattias Jernberg (1): bitbake: utils: Add enable_loopback_networking() Michael Opdenacker (8): bitbake: bitbake-user-manual: mention pydevshell in OE dev-manual: common-tasks.rst: refer to Python functions in BitBake manual ref-manual: features.rst: add missing default distro features ref-manual: variables.rst: remove BBPATH ref-manual: structure.rst: add reference to the contents of the build directory ref-manual: structure.rst: improve information about build/cache/ ref-manual: variables.rst: correct templateconf.cfg file name ref-manual: structure.rst: add more subsection levels Mikko Rapeli (7): u-boot: switch from append to += in SRC_URI glibc-tests: use += instead of :append go-native: switch from SRC_URI:append to SRC_URI += python3-rfc3986-validator: switch from SRC_URI:append to SRC_URI += linux-libc-headers: switch from SRC_URI:append to SRC_URI += common-tasks.rst: remove SRC_URI:append from examples kernel-dev/common.rst: remove SRC_URI:append from examples Mingli Yu (1): busybox: add devmem 128-bit support Otavio Salvador (2): bitbake: toaster: fix kirkstone version rust-hello-world: move to recipes-extended Pascal Bach (1): bitbake: fetch2/ssh.py: fix checkstatus Paulo Neves (2): watchdog: Remove unneeded tirpc dependency bitbake: fetch2: Remove unneeded conditional Pavel Zhukov (1): core-image.bbclass: Exclude openssh complementary packages Peter Bergin (1): rootfs-postcommands.bbclass: avoid moving ssh host keys if etc is writable Peter Kjellerstedt (6): cairo: Adapt the license information based on what is being built oe-setup-builddir: Correct when validation of the templates dir is run oe-setup-builddir: Simplify error handling oe-setup-builddir: Avoid shellcheck warnings oe-setup-builddir: Keep templateconf.cfg relative if $TEMPLATECONF is oe-setup-builddir: Always update templateconf.cfg Petr Vorel (1): ltp: Update list of tests not buildable on musl Richard Purdie (54): bitbake: wget: Avoid bad checksum race issues bitbake: asyncrpc/client: Fix unix domain socket chdir race issues build-appliance-image: Update to master head revision sstate: Fix sstate file mirroring checksum issue bitbake: fetch2: Ensure mirror tarballs don't enforce checksum qemu: Upgrade 7.0.0 -> 7.1.0 qemurunner: Update to match qmp changes build-appliance-image: Update to master head revision vim: Upgrade 9.0.0341 -> 9.0.0453 selftest/qemurunner: Work around possible control character contamination oetest: Drop unused variable oetest: Drop getResults usage from oeRuntimeTest oeqa/utils/decorators: Drop unused decorators oeqa/utils/decorators: Drop getResults autoconf-archive: upgrade 2022.02.11 -> 2022.09.03 ofono: upgrade 1.34 -> 2.0 ccache: upgrade 4.6.2 -> 4.6.3 btrfs-tools: upgrade 5.19 -> 5.19.1 dnf: upgrade 4.13.0 -> 4.14.0 git: upgrade 2.37.2 -> 2.37.3 ell: upgrade 0.52 -> 0.53 file: upgrade 5.42 -> 5.43 ninja: upgrade 1.11.0 -> 1.11.1 libcomps: upgrade 0.1.18 -> 0.1.19 python3-hatchling: upgrade 1.8.1 -> 1.9.0 meson: upgrade 0.63.1 -> 0.63.2 python3-idna: upgrade 3.3 -> 3.4 librepo: upgrade 1.14.4 -> 1.14.5 python3-hypothesis: upgrade 6.46.11 -> 6.54.5 python3-numpy: upgrade 1.23.2 -> 1.23.3 libdnf: upgrade 0.68.0 -> 0.69.0 python3-psutil: upgrade 5.9.1 -> 5.9.2 ffmpeg: upgrade 5.1 -> 5.1.1 repo: upgrade 2.29.1 -> 2.29.2 nghttp2: upgrade 1.48.0 -> 1.49.0 libjitterentropy: upgrade 3.4.0 -> 3.4.1 sqlite3: upgrade 3.39.2 -> 3.39.3 diffoscope: upgrade 220 -> 221 python3-certifi: upgrade 2022.6.15 -> 2022.9.14 libpng: upgrade 1.6.37 -> 1.6.38 numactl: upgrade 2.0.14 -> 2.0.15 rpm: Upgrade 4.17.1 -> 4.18rc1 perf: Fix for recent kernel upgrades oeqa/runtime/virgl: Update test to match new mesa version vim: Upgrade 9.0.453 -> 9.0.541 vim: Upgrade 9.0.0541 -> 9.0.0598 qemu: Add patch to address arm qemu upgrade issues layer.conf: Update to use langdale as the core layer name poky: Update to 4.1 version poky: Update to match poky version numbers bitbake: bitbake: Bump to version 2.2.0 build-appliance-image: Update to master head revision go: Fix reproducibility failures build-appliance-image: Update to master head revision Robert Joslyn (6): xorg-lib-common: Add variable to set tarball type libxfont2: Update 2.0.5 to 2.0.6 libxau: Update 1.0.9 to 1.0.10 libfontenc: Update 1.1.4 to 1.1.6 flac: Update 1.3.4 to 1.4.0 tzdata: Update from 2022b to 2022c Ross Burton (16): meta-selftest/poison: improve sysroot poisoning test case gcc-cross: pass -Werror=poison-system-directories to compiler stages gcc: remove obsolete 0012-export-CPP.patch xmlto: remove redundant patches tiff: backport fix for CVE-2022-2953 gcc: remove obsolete poisoned calloc workaround gcc: remove obsolete MinGW patch oeqa/selftest/debuginfod: don't re-use the database libgcrypt: disable bench-slope test case libxml2: don't override XML_CATALOG_FILES in xmllint wrapper if already set glibc: mark a CVE where we have merged the fix qemu: re-add the fix for CVE-2022-1050 qemu: fix CVE-2022-2962 dnf: add dummy packages for testing oeqa/runtime/dnf: use dnf-test packages Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" Ruiqiang Hao (1): tune-neoversen2: support tune-neoversen2 base on armv9a Samuli Piippo (2): Revert "gcc-cross-canadian: Add symlink to real-ld alongside other symlinks" gcc-cross-canadian: add default plugin linker Stefano Babic (1): libubootenv: upgrade 0.3.2 -> 0.3.3 Sundeep KOKKONDA (1): rust-cross-canadian: Fix for the issue caused by using sdk shell Teoh Jay Shen (1): bind: upgrade 9.18.6 -> 9.18.7 Tom Hochstein (2): cmake: Fix CMAKE_SYSTEM_PROCESSOR setting for SDK connman: Drop redundant nfsroot handling Ulrich Ölmann (5): icecc.bbclass: fix typos icecc.bbclass: delete 'rm' command manuals: fix paths to default templates & clean up whitespaces icecc.bbclass: fix filename of recipe in comment manuals: fix typos in the context of 'icecc' & clean up whitespaces Vyacheslav Yurkov (5): oeqa/selftest: drop image_feature test from overlayfs classes: Update overlayfs classes to use new bitbake functionality files: overlayfs-etc: refactor preinit template classes: files: Extend overlayfs-etc class oeqa/selftest: Add lower layer test for overlayfs-etc niko.mauno@vaisala.com (2): systemd: Add 'no-dns-fallback' PACKAGECONFIG option systemd: Fix unwritable /var/lock when no sysvinit handling pgowda (4): rust: Add linker configurations for cross compilation rust: Enable verbose-tests to get the test results in readable format binutils : CVE-2022-38533 binutils : Fix CVE-2022-38128 wangmy (9): cracklib: upgrade 2.9.7 -> 2.9.8 kmscube: upgrade to latest revision piglit: upgrade to latest revision python3-dtschema: upgrade 2022.8.1 -> 2022.8.3 python3-mako: upgrade 1.2.1 -> 1.2.2 python3-pathspec: upgrade 0.9.0 -> 0.10.1 python3-pytest: upgrade 7.1.2 -> 7.1.3 vala: upgrade 0.56.2 -> 0.56.3 less: upgrade 600 -> 608 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I1705b78d8a5ef5762fe770a69ed9b866fac52ccf
Diffstat (limited to 'poky/meta/recipes-devtools/qemu')
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu-native_7.1.0.bb (renamed from poky/meta/recipes-devtools/qemu/qemu-native_7.0.0.bb)0
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu-system-native_7.1.0.bb (renamed from poky/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb)3
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu.inc21
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch64
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch46
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch92
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch115
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch42
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch146
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch53
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch27
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu/cross.patch17
-rw-r--r--poky/meta/recipes-devtools/qemu/qemu_7.1.0.bb (renamed from poky/meta/recipes-devtools/qemu/qemu_7.0.0.bb)0
13 files changed, 127 insertions, 499 deletions
diff --git a/poky/meta/recipes-devtools/qemu/qemu-native_7.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-native_7.1.0.bb
index a94dc0b61e..a94dc0b61e 100644
--- a/poky/meta/recipes-devtools/qemu/qemu-native_7.0.0.bb
+++ b/poky/meta/recipes-devtools/qemu/qemu-native_7.1.0.bb
diff --git a/poky/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-system-native_7.1.0.bb
index 5ccede5095..04c7c2a6ac 100644
--- a/poky/meta/recipes-devtools/qemu/qemu-system-native_7.0.0.bb
+++ b/poky/meta/recipes-devtools/qemu/qemu-system-native_7.1.0.bb
@@ -28,5 +28,6 @@ do_install:append() {
rm -rf ${D}${includedir}/qemu-plugin.h
# Install qmp.py to be used with testimage
- install -D ${S}/python/qemu/qmp/__init__.py ${D}${libdir}/qemu-python/qmp.py
+ install -d ${D}${libdir}/qemu-python/qmp/
+ install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
}
diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc
index 56fc7aaf55..612abd240a 100644
--- a/poky/meta/recipes-devtools/qemu/qemu.inc
+++ b/poky/meta/recipes-devtools/qemu/qemu.inc
@@ -27,16 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
- file://qemu-7.0.0-glibc-2.36.patch \
- file://CVE-2022-35414.patch \
- file://CVE-2021-3507_1.patch \
- file://CVE-2021-3507_2.patch \
- file://CVE-2022-0216_1.patch \
- file://CVE-2022-0216_2.patch \
+ file://0001-net-tulip-Restrict-DMA-engine-to-memories.patch \
+ file://arm-cpreg-fix.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
-SRC_URI[sha256sum] = "f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839"
+SRC_URI[sha256sum] = "a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6"
SRC_URI:append:class-target = " file://cross.patch"
SRC_URI:append:class-nativesdk = " file://cross.patch"
@@ -75,8 +71,14 @@ do_install_ptest() {
# Strip the paths from the QEMU variable, we can use PATH
sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak
- # Strip compiler flags as they break reproducibility
- sed -i -e "s,CROSS_CC_GUEST=.*,CROSS_CC_GUEST=," ${D}${PTEST_PATH}/tests/tcg/*.mak
+ # Strip compiler flags as they break reproducibility
+ sed -i -e "s,^CC=.*,CC=gcc," \
+ -e "s,^CCAS=.*,CCAS=gcc," \
+ -e "s,^LD=.*,LD=ld," ${D}${PTEST_PATH}/tests/tcg/*.mak
+
+ # Update SRC_PATH variable to the right place on target
+ sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" ${D}${PTEST_PATH}/tests/tcg/*.mak
+
}
# QEMU_TARGETS is overridable variable
@@ -151,7 +153,6 @@ PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburin
PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest"
PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
-PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng,"
PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl,"
PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch
new file mode 100644
index 0000000000..6c85a77ba7
--- /dev/null
+++ b/poky/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch
@@ -0,0 +1,64 @@
+CVE: CVE-2022-2962
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From 5c5c50b0a73d78ffe18336c9996fef5eae9bbbb0 Mon Sep 17 00:00:00 2001
+From: Zheyu Ma <zheyuma97@gmail.com>
+Date: Sun, 21 Aug 2022 20:43:43 +0800
+Subject: [PATCH] net: tulip: Restrict DMA engine to memories
+
+The DMA engine is started by I/O access and then itself accesses the
+I/O registers, triggering a reentrancy bug.
+
+The following log can reveal it:
+==5637==ERROR: AddressSanitizer: stack-overflow
+ #0 0x5595435f6078 in tulip_xmit_list_update qemu/hw/net/tulip.c:673
+ #1 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13
+ #2 0x559544637f86 in memory_region_write_accessor qemu/softmmu/memory.c:492:5
+ #3 0x5595446379fa in access_with_adjusted_size qemu/softmmu/memory.c:554:18
+ #4 0x5595446372fa in memory_region_dispatch_write qemu/softmmu/memory.c
+ #5 0x55954468b74c in flatview_write_continue qemu/softmmu/physmem.c:2825:23
+ #6 0x559544683662 in flatview_write qemu/softmmu/physmem.c:2867:12
+ #7 0x5595446833f3 in address_space_write qemu/softmmu/physmem.c:2963:18
+ #8 0x5595435fb082 in dma_memory_rw_relaxed qemu/include/sysemu/dma.h:87:12
+ #9 0x5595435fb082 in dma_memory_rw qemu/include/sysemu/dma.h:130:12
+ #10 0x5595435fb082 in dma_memory_write qemu/include/sysemu/dma.h:171:12
+ #11 0x5595435fb082 in stl_le_dma qemu/include/sysemu/dma.h:272:1
+ #12 0x5595435fb082 in stl_le_pci_dma qemu/include/hw/pci/pci.h:910:1
+ #13 0x5595435fb082 in tulip_desc_write qemu/hw/net/tulip.c:101:9
+ #14 0x5595435f7e3d in tulip_xmit_list_update qemu/hw/net/tulip.c:706:9
+ #15 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13
+
+Fix this bug by restricting the DMA engine to memories regions.
+
+Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/tulip.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/net/tulip.c b/hw/net/tulip.c
+index 097e905bec..b9e42c322a 100644
+--- a/hw/net/tulip.c
++++ b/hw/net/tulip.c
+@@ -70,7 +70,7 @@ static const VMStateDescription vmstate_pci_tulip = {
+ static void tulip_desc_read(TULIPState *s, hwaddr p,
+ struct tulip_descriptor *desc)
+ {
+- const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
++ const MemTxAttrs attrs = { .memory = true };
+
+ if (s->csr[0] & CSR0_DBO) {
+ ldl_be_pci_dma(&s->dev, p, &desc->status, attrs);
+@@ -88,7 +88,7 @@ static void tulip_desc_read(TULIPState *s, hwaddr p,
+ static void tulip_desc_write(TULIPState *s, hwaddr p,
+ struct tulip_descriptor *desc)
+ {
+- const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
++ const MemTxAttrs attrs = { .memory = true };
+
+ if (s->csr[0] & CSR0_DBO) {
+ stl_be_pci_dma(&s->dev, p, desc->status, attrs);
+--
+2.34.1
+
diff --git a/poky/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/poky/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
index 826d42fc20..810c74fabd 100644
--- a/poky/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
+++ b/poky/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch
@@ -1,28 +1,28 @@
-From 52c38fa9f3a790a7c2805e7d8cce3ea9262d6ae2 Mon Sep 17 00:00:00 2001
+CVE: CVE-2022-1050
+Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From dbdef95c272e8f3ec037c3db4197c66002e30995 Mon Sep 17 00:00:00 2001
From: Yuval Shaia <yuval.shaia.ml@gmail.com>
-Date: Tue, 12 Apr 2022 11:01:51 +0100
-Subject: [PATCH 10/12] hw/pvrdma: Protect against buggy or malicious guest
- driver
+Date: Sun, 3 Apr 2022 12:52:34 +0300
+Subject: [PATCH] hw/pvrdma: Protect against buggy or malicious guest driver
Guest driver might execute HW commands when shared buffers are not yet
allocated.
-This might happen on purpose (malicious guest) or because some other
-guest/host address mapping.
+This could happen on purpose (malicious guest) or because of some other
+guest/host address mapping error.
We need to protect againts such case.
-Reported-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
-
-CVE: CVE-2022-1050
-Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05197.html]
+Fixes: CVE-2022-1050
+Reported-by: Raven <wxhusst@gmail.com>
+Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
---
- hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
- hw/rdma/vmw/pvrdma_main.c | 3 ++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
+ hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
-index da7ddfa54..89db963c4 100644
+index da7ddfa548..89db963c46 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -796,6 +796,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev)
@@ -38,20 +38,6 @@ index da7ddfa54..89db963c4 100644
if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) /
sizeof(struct cmd_handler)) {
rdma_error_report("Unsupported command");
-diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
-index 91206dbb8..0b7d908e2 100644
---- a/hw/rdma/vmw/pvrdma_main.c
-+++ b/hw/rdma/vmw/pvrdma_main.c
-@@ -249,7 +249,8 @@ static void init_dsr_dev_caps(PVRDMADev *dev)
- {
- struct pvrdma_device_shared_region *dsr;
-
-- if (dev->dsr_info.dsr == NULL) {
-+ if (!dev->dsr_info.dsr) {
-+ /* Buggy or malicious guest driver */
- rdma_error_report("Can't initialized DSR");
- return;
- }
--
-2.30.2
+2.34.1
diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch
deleted file mode 100644
index 24fd2c5ed3..0000000000
--- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57a89cc36ead7234e540d0ecbe1a792ab6b04cb7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
-Date: Thu, 18 Nov 2021 12:57:32 +0100
-Subject: [PATCH 1/2] hw/block/fdc: Prevent end-of-track overrun
- (CVE-2021-3507)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the 82078 datasheet, if the end-of-track (EOT byte in
-the FIFO) is more than the number of sectors per side, the
-command is terminated unsuccessfully:
-
-* 5.2.5 DATA TRANSFER TERMINATION
-
- The 82078 supports terminal count explicitly through
- the TC pin and implicitly through the underrun/over-
- run and end-of-track (EOT) functions. For full sector
- transfers, the EOT parameter can define the last
- sector to be transferred in a single or multisector
- transfer. If the last sector to be transferred is a par-
- tial sector, the host can stop transferring the data in
- mid-sector, and the 82078 will continue to complete
- the sector as if a hardware TC was received. The
- only difference between these implicit functions and
- TC is that they return "abnormal termination" result
- status. Such status indications can be ignored if they
- were expected.
-
-* 6.1.3 READ TRACK
-
- This command terminates when the EOT specified
- number of sectors have been read. If the 82078
- does not find an I D Address Mark on the diskette
- after the second· occurrence of a pulse on the
- INDX# pin, then it sets the IC code in Status Regis-
- ter 0 to "01" (Abnormal termination), sets the MA bit
- in Status Register 1 to "1", and terminates the com-
- mand.
-
-* 6.1.6 VERIFY
-
- Refer to Table 6-6 and Table 6-7 for information
- concerning the values of MT and EC versus SC and
- EOT value.
-
-* Table 6·6. Result Phase Table
-
-* Table 6-7. Verify Command Result Phase Table
-
-Fix by aborting the transfer when EOT > # Sectors Per Side.
-
-Cc: qemu-stable@nongnu.org
-Cc: Hervé Poussineau <hpoussin@reactos.org>
-Fixes: baca51faff0 ("floppy driver: disk geometry auto detect")
-Reported-by: Alexander Bulekov <alxndr@bu.edu>
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/339
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-Id: <20211118115733.4038610-2-philmd@redhat.com>
-Reviewed-by: Hanna Reitz <hreitz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-
-Upstream-Status: Backport [defac5e2fbddf8423a354ff0454283a2115e1367]
-CVE: CVE-2021-3507
-
-Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
----
- hw/block/fdc.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/hw/block/fdc.c b/hw/block/fdc.c
-index 347875a0c..57bb35579 100644
---- a/hw/block/fdc.c
-+++ b/hw/block/fdc.c
-@@ -1530,6 +1530,14 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
- int tmp;
- fdctrl->data_len = 128 << (fdctrl->fifo[5] > 7 ? 7 : fdctrl->fifo[5]);
- tmp = (fdctrl->fifo[6] - ks + 1);
-+ if (tmp < 0) {
-+ FLOPPY_DPRINTF("invalid EOT: %d\n", tmp);
-+ fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00);
-+ fdctrl->fifo[3] = kt;
-+ fdctrl->fifo[4] = kh;
-+ fdctrl->fifo[5] = ks;
-+ return;
-+ }
- if (fdctrl->fifo[0] & 0x80)
- tmp += fdctrl->fifo[6];
- fdctrl->data_len *= tmp;
---
-2.33.0
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch
deleted file mode 100644
index acc93e897b..0000000000
--- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 3e8601ec707dcbc3c768f7733d016dc70c947e4a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
-Date: Thu, 18 Nov 2021 12:57:33 +0100
-Subject: [PATCH 2/2] tests/qtest/fdc-test: Add a regression test for
- CVE-2021-3507
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add the reproducer from https://gitlab.com/qemu-project/qemu/-/issues/339
-
-Without the previous commit, when running 'make check-qtest-i386'
-with QEMU configured with '--enable-sanitizers' we get:
-
- ==4028352==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x619000062a00 at pc 0x5626d03c491a bp 0x7ffdb4199410 sp 0x7ffdb4198bc0
- READ of size 786432 at 0x619000062a00 thread T0
- #0 0x5626d03c4919 in __asan_memcpy (qemu-system-i386+0x1e65919)
- #1 0x5626d1c023cc in flatview_write_continue softmmu/physmem.c:2787:13
- #2 0x5626d1bf0c0f in flatview_write softmmu/physmem.c:2822:14
- #3 0x5626d1bf0798 in address_space_write softmmu/physmem.c:2914:18
- #4 0x5626d1bf0f37 in address_space_rw softmmu/physmem.c:2924:16
- #5 0x5626d1bf14c8 in cpu_physical_memory_rw softmmu/physmem.c:2933:5
- #6 0x5626d0bd5649 in cpu_physical_memory_write include/exec/cpu-common.h:82:5
- #7 0x5626d0bd0a07 in i8257_dma_write_memory hw/dma/i8257.c:452:9
- #8 0x5626d09f825d in fdctrl_transfer_handler hw/block/fdc.c:1616:13
- #9 0x5626d0a048b4 in fdctrl_start_transfer hw/block/fdc.c:1539:13
- #10 0x5626d09f4c3e in fdctrl_write_data hw/block/fdc.c:2266:13
- #11 0x5626d09f22f7 in fdctrl_write hw/block/fdc.c:829:9
- #12 0x5626d1c20bc5 in portio_write softmmu/ioport.c:207:17
-
- 0x619000062a00 is located 0 bytes to the right of 512-byte region [0x619000062800,0x619000062a00)
- allocated by thread T0 here:
- #0 0x5626d03c66ec in posix_memalign (qemu-system-i386+0x1e676ec)
- #1 0x5626d2b988d4 in qemu_try_memalign util/oslib-posix.c:210:11
- #2 0x5626d2b98b0c in qemu_memalign util/oslib-posix.c:226:27
- #3 0x5626d09fbaf0 in fdctrl_realize_common hw/block/fdc.c:2341:20
- #4 0x5626d0a150ed in isabus_fdc_realize hw/block/fdc-isa.c:113:5
- #5 0x5626d2367935 in device_set_realized hw/core/qdev.c:531:13
-
- SUMMARY: AddressSanitizer: heap-buffer-overflow (qemu-system-i386+0x1e65919) in __asan_memcpy
- Shadow bytes around the buggy address:
- 0x0c32800044f0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x0c3280004510: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x0c3280004520: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x0c3280004530: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- =>0x0c3280004540:[fa]fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004550: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004560: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004570: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004580: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
- 0x0c3280004590: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
- Shadow byte legend (one shadow byte represents 8 application bytes):
- Addressable: 00
- Heap left redzone: fa
- Freed heap region: fd
- ==4028352==ABORTING
-
-[ kwolf: Added snapshot=on to prevent write file lock failure ]
-
-Reported-by: Alexander Bulekov <alxndr@bu.edu>
-Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-
-Upstream-Status: Backport [46609b90d9e3a6304def11038a76b58ff43f77bc]
-CVE: CVE-2021-3507
-
-Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
----
- tests/qtest/fdc-test.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
-index b0d40012e..1d4f85212 100644
---- a/tests/qtest/fdc-test.c
-+++ b/tests/qtest/fdc-test.c
-@@ -583,6 +583,26 @@ static void test_cve_2021_20196(void)
- qtest_quit(s);
- }
-
-+static void test_cve_2021_3507(void)
-+{
-+ QTestState *s;
-+
-+ s = qtest_initf("-nographic -m 32M -nodefaults "
-+ "-drive file=%s,format=raw,if=floppy,snapshot=on",
-+ test_image);
-+ qtest_outl(s, 0x9, 0x0a0206);
-+ qtest_outw(s, 0x3f4, 0x1600);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_outw(s, 0x3f4, 0x0200);
-+ qtest_outw(s, 0x3f4, 0x0200);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_outw(s, 0x3f4, 0x0000);
-+ qtest_quit(s);
-+}
-+
- int main(int argc, char **argv)
- {
- int fd;
-@@ -614,6 +634,7 @@ int main(int argc, char **argv)
- qtest_add_func("/fdc/read_no_dma_19", test_read_no_dma_19);
- qtest_add_func("/fdc/fuzz-registers", fuzz_registers);
- qtest_add_func("/fdc/fuzz/cve_2021_20196", test_cve_2021_20196);
-+ qtest_add_func("/fdc/fuzz/cve_2021_3507", test_cve_2021_3507);
-
- ret = g_test_run();
-
---
-2.33.0
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch
deleted file mode 100644
index 56fc34ce5a..0000000000
--- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f37ac8619a39498edd225c4a0b3039b28814833d Mon Sep 17 00:00:00 2001
-From: Mauro Matteo Cascella <mcascell@redhat.com>
-Date: Tue, 5 Jul 2022 22:05:43 +0200
-Subject: [PATCH 1/2] scsi/lsi53c895a: fix use-after-free in lsi_do_msgout
- (CVE-2022-0216)
-
-Set current_req->req to NULL to prevent reusing a free'd buffer in case of
-repeated SCSI cancel requests. Thanks to Thomas Huth for suggesting the patch.
-
-Fixes: CVE-2022-0216
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972
-Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Message-Id: <20220705200543.2366809-1-mcascell@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Upstream-Status: Backport [6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8]
-CVE: CVE-2022-0216
-
-Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
----
- hw/scsi/lsi53c895a.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index c8773f73f..99ea42d49 100644
---- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -1028,8 +1028,9 @@ static void lsi_do_msgout(LSIState *s)
- case 0x0d:
- /* The ABORT TAG message clears the current I/O process only. */
- trace_lsi_do_msgout_abort(current_tag);
-- if (current_req) {
-+ if (current_req && current_req->req) {
- scsi_req_cancel(current_req->req);
-+ current_req->req = NULL;
- }
- lsi_disconnect(s);
- break;
---
-2.33.0
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch
deleted file mode 100644
index f332154b6a..0000000000
--- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 5451bf6db85ce3da1238e9154d051ebccec8f171 Mon Sep 17 00:00:00 2001
-From: Mauro Matteo Cascella <mcascell@redhat.com>
-Date: Mon, 11 Jul 2022 14:33:16 +0200
-Subject: [PATCH 2/2] scsi/lsi53c895a: really fix use-after-free in
- lsi_do_msgout (CVE-2022-0216)
-
-Set current_req to NULL, not current_req->req, to prevent reusing a free'd
-buffer in case of repeated SCSI cancel requests. Also apply the fix to
-CLEAR QUEUE and BUS DEVICE RESET messages as well, since they also cancel
-the request.
-
-Thanks to Alexander Bulekov for providing a reproducer.
-
-Fixes: CVE-2022-0216
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972
-Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Tested-by: Alexander Bulekov <alxndr@bu.edu>
-Message-Id: <20220711123316.421279-1-mcascell@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Upstream-Status: Backport [4367a20cc442c56b05611b4224de9a61908f9eac]
-CVE: CVE-2022-0216
-
-Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
----
- hw/scsi/lsi53c895a.c | 3 +-
- tests/qtest/fuzz-lsi53c895a-test.c | 76 ++++++++++++++++++++++++++++++
- 2 files changed, 78 insertions(+), 1 deletion(-)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index 99ea42d49..ad5f5e5f3 100644
---- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -1030,7 +1030,7 @@ static void lsi_do_msgout(LSIState *s)
- trace_lsi_do_msgout_abort(current_tag);
- if (current_req && current_req->req) {
- scsi_req_cancel(current_req->req);
-- current_req->req = NULL;
-+ current_req = NULL;
- }
- lsi_disconnect(s);
- break;
-@@ -1056,6 +1056,7 @@ static void lsi_do_msgout(LSIState *s)
- /* clear the current I/O process */
- if (s->current) {
- scsi_req_cancel(s->current->req);
-+ current_req = NULL;
- }
-
- /* As the current implemented devices scsi_disk and scsi_generic
-diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c
-index ba5d46897..c1af0ab1c 100644
---- a/tests/qtest/fuzz-lsi53c895a-test.c
-+++ b/tests/qtest/fuzz-lsi53c895a-test.c
-@@ -8,6 +8,79 @@
- #include "qemu/osdep.h"
- #include "libqos/libqtest.h"
-
-+/*
-+ * This used to trigger a UAF in lsi_do_msgout()
-+ * https://gitlab.com/qemu-project/qemu/-/issues/972
-+ */
-+static void test_lsi_do_msgout_cancel_req(void)
-+{
-+ QTestState *s;
-+
-+ if (sizeof(void *) == 4) {
-+ g_test_skip("memory size too big for 32-bit build");
-+ return;
-+ }
-+
-+ s = qtest_init("-M q35 -m 4G -display none -nodefaults "
-+ "-device lsi53c895a,id=scsi "
-+ "-device scsi-hd,drive=disk0 "
-+ "-drive file=null-co://,id=disk0,if=none,format=raw");
-+
-+ qtest_outl(s, 0xcf8, 0x80000810);
-+ qtest_outl(s, 0xcf8, 0xc000);
-+ qtest_outl(s, 0xcf8, 0x80000810);
-+ qtest_outw(s, 0xcfc, 0x7);
-+ qtest_outl(s, 0xcf8, 0x80000810);
-+ qtest_outl(s, 0xcfc, 0xc000);
-+ qtest_outl(s, 0xcf8, 0x80000804);
-+ qtest_outw(s, 0xcfc, 0x05);
-+ qtest_writeb(s, 0x69736c10, 0x08);
-+ qtest_writeb(s, 0x69736c13, 0x58);
-+ qtest_writeb(s, 0x69736c1a, 0x01);
-+ qtest_writeb(s, 0x69736c1b, 0x06);
-+ qtest_writeb(s, 0x69736c22, 0x01);
-+ qtest_writeb(s, 0x69736c23, 0x07);
-+ qtest_writeb(s, 0x69736c2b, 0x02);
-+ qtest_writeb(s, 0x69736c48, 0x08);
-+ qtest_writeb(s, 0x69736c4b, 0x58);
-+ qtest_writeb(s, 0x69736c52, 0x04);
-+ qtest_writeb(s, 0x69736c53, 0x06);
-+ qtest_writeb(s, 0x69736c5b, 0x02);
-+ qtest_outl(s, 0xc02d, 0x697300);
-+ qtest_writeb(s, 0x5a554662, 0x01);
-+ qtest_writeb(s, 0x5a554663, 0x07);
-+ qtest_writeb(s, 0x5a55466a, 0x10);
-+ qtest_writeb(s, 0x5a55466b, 0x22);
-+ qtest_writeb(s, 0x5a55466c, 0x5a);
-+ qtest_writeb(s, 0x5a55466d, 0x5a);
-+ qtest_writeb(s, 0x5a55466e, 0x34);
-+ qtest_writeb(s, 0x5a55466f, 0x5a);
-+ qtest_writeb(s, 0x5a345a5a, 0x77);
-+ qtest_writeb(s, 0x5a345a5b, 0x55);
-+ qtest_writeb(s, 0x5a345a5c, 0x51);
-+ qtest_writeb(s, 0x5a345a5d, 0x27);
-+ qtest_writeb(s, 0x27515577, 0x41);
-+ qtest_outl(s, 0xc02d, 0x5a5500);
-+ qtest_writeb(s, 0x364001d0, 0x08);
-+ qtest_writeb(s, 0x364001d3, 0x58);
-+ qtest_writeb(s, 0x364001da, 0x01);
-+ qtest_writeb(s, 0x364001db, 0x26);
-+ qtest_writeb(s, 0x364001dc, 0x0d);
-+ qtest_writeb(s, 0x364001dd, 0xae);
-+ qtest_writeb(s, 0x364001de, 0x41);
-+ qtest_writeb(s, 0x364001df, 0x5a);
-+ qtest_writeb(s, 0x5a41ae0d, 0xf8);
-+ qtest_writeb(s, 0x5a41ae0e, 0x36);
-+ qtest_writeb(s, 0x5a41ae0f, 0xd7);
-+ qtest_writeb(s, 0x5a41ae10, 0x36);
-+ qtest_writeb(s, 0x36d736f8, 0x0c);
-+ qtest_writeb(s, 0x36d736f9, 0x80);
-+ qtest_writeb(s, 0x36d736fa, 0x0d);
-+ qtest_outl(s, 0xc02d, 0x364000);
-+
-+ qtest_quit(s);
-+}
-+
- /*
- * This used to trigger the assert in lsi_do_dma()
- * https://bugs.launchpad.net/qemu/+bug/697510
-@@ -48,5 +121,8 @@ int main(int argc, char **argv)
- test_lsi_do_dma_empty_queue);
- }
-
-+ qtest_add_func("fuzz/lsi53c895a/lsi_do_msgout_cancel_req",
-+ test_lsi_do_msgout_cancel_req);
-+
- return g_test_run();
- }
---
-2.33.0
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
deleted file mode 100644
index fe79a749ae..0000000000
--- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a10c33942dc8cb31b3762b9dd4adde4c490eed9c Mon Sep 17 00:00:00 2001
-From: Hitendra Prajapati <hprajapati@mvista.com>
-Date: Wed, 3 Aug 2022 10:11:11 +0530
-Subject: [PATCH] CVE-2022-35414
-
-Upstream-Status: Backport [https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c]
-CVE: CVE-2022-35414
-Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
----
- softmmu/physmem.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/softmmu/physmem.c b/softmmu/physmem.c
-index 4e1b27a20..ad8a90dec 100644
---- a/softmmu/physmem.c
-+++ b/softmmu/physmem.c
-@@ -669,7 +669,7 @@ void tcg_iommu_init_notifier_list(CPUState *cpu)
-
- /* Called from RCU critical section */
- MemoryRegionSection *
--address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
-+address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr orig_addr,
- hwaddr *xlat, hwaddr *plen,
- MemTxAttrs attrs, int *prot)
- {
-@@ -678,6 +678,7 @@ address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
- IOMMUMemoryRegionClass *imrc;
- IOMMUTLBEntry iotlb;
- int iommu_idx;
-+ hwaddr addr = orig_addr;
- AddressSpaceDispatch *d =
- qatomic_rcu_read(&cpu->cpu_ases[asidx].memory_dispatch);
-
-@@ -722,6 +723,16 @@ address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
- return section;
-
- translate_fail:
-+ /*
-+ * We should be given a page-aligned address -- certainly
-+ * tlb_set_page_with_attrs() does so. The page offset of xlat
-+ * is used to index sections[], and PHYS_SECTION_UNASSIGNED = 0.
-+ * The page portion of xlat will be logged by memory_region_access_valid()
-+ * when this memory access is rejected, so use the original untranslated
-+ * physical address.
-+ */
-+ assert((orig_addr & ~TARGET_PAGE_MASK) == 0);
-+ *xlat = orig_addr;
- return &d->map.sections[PHYS_SECTION_UNASSIGNED];
- }
-
---
-2.25.1
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch b/poky/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch
new file mode 100644
index 0000000000..071691f8ca
--- /dev/null
+++ b/poky/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch
@@ -0,0 +1,27 @@
+target/arm: mark SP_EL1 with ARM_CP_EL3_NO_EL2_KEEP
+
+SP_EL1 must be kept when EL3 is present but EL2 is not. Therefore mark
+it with ARM_CP_EL3_NO_EL2_KEEP.
+
+Fixes: 696ba3771894 ("target/arm: Handle cpreg registration for missing EL")
+Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-09/msg04515.html]
+
+---
+ target/arm/helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-7.1.0/target/arm/helper.c
+===================================================================
+--- qemu-7.1.0.orig/target/arm/helper.c
++++ qemu-7.1.0/target/arm/helper.c
+@@ -4971,7 +4971,7 @@ static const ARMCPRegInfo v8_cp_reginfo[
+ .fieldoffset = offsetof(CPUARMState, sp_el[0]) },
+ { .name = "SP_EL1", .state = ARM_CP_STATE_AA64,
+ .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 1, .opc2 = 0,
+- .access = PL2_RW, .type = ARM_CP_ALIAS,
++ .access = PL2_RW, .type = ARM_CP_ALIAS | ARM_CP_EL3_NO_EL2_KEEP,
+ .fieldoffset = offsetof(CPUARMState, sp_el[1]) },
+ { .name = "SPSel", .state = ARM_CP_STATE_AA64,
+ .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 2, .opc2 = 0,
diff --git a/poky/meta/recipes-devtools/qemu/qemu/cross.patch b/poky/meta/recipes-devtools/qemu/qemu/cross.patch
index d1256a1229..ca2ad361ef 100644
--- a/poky/meta/recipes-devtools/qemu/qemu/cross.patch
+++ b/poky/meta/recipes-devtools/qemu/qemu/cross.patch
@@ -14,19 +14,19 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
configure | 4 ----
1 file changed, 4 deletions(-)
-diff --git a/configure b/configure
-index 7c08c1835..0613279f9 100755
---- a/configure
-+++ b/configure
-@@ -3118,7 +3118,6 @@ if test "$skip_meson" = no; then
- fi
+Index: qemu-7.1.0/configure
+===================================================================
+--- qemu-7.1.0.orig/configure
++++ qemu-7.1.0/configure
+@@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then
echo "strip = [$(meson_quote $strip)]" >> $cross
+ echo "widl = [$(meson_quote $widl)]" >> $cross
echo "windres = [$(meson_quote $windres)]" >> $cross
- if test "$cross_compile" = "yes"; then
cross_arg="--cross-file config-meson.cross"
echo "[host_machine]" >> $cross
echo "system = '$targetos'" >> $cross
-@@ -3136,9 +3135,6 @@ if test "$skip_meson" = no; then
+@@ -2728,9 +2727,6 @@ if test "$skip_meson" = no; then
else
echo "endian = 'little'" >> $cross
fi
@@ -36,6 +36,3 @@ index 7c08c1835..0613279f9 100755
mv $cross config-meson.cross
rm -rf meson-private meson-info meson-logs
---
-2.30.2
-
diff --git a/poky/meta/recipes-devtools/qemu/qemu_7.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu_7.1.0.bb
index 42e133967e..42e133967e 100644
--- a/poky/meta/recipes-devtools/qemu/qemu_7.0.0.bb
+++ b/poky/meta/recipes-devtools/qemu/qemu_7.1.0.bb