review request
cover review request
Please review these changes for hardknott. Testing on autobuilder resulted in some intermittent ptest failures in valgrind, tcl and lttng-tools and also a qemu timeout failure in musl-qemux86-64.
Thanks,
Anuj
The following changes since commit 2fd915eda136e20ab52baea6bb908d08ef8f5cbc:
oe-setup-builddir: update YP docs and OE URLs (2021-07-31 17:56:12 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/hardknott
Alexander Kanavin (2):
devtool: print a warning on upgrades if PREFERRED_VERSION is set
nettle: update 3.7.2 -> 3.7.3
Bruce Ashfield (4):
linux-yocto/5.10: update to v5.10.53 linux-yocto/5.4: update to v5.4.135 linux-yocto-rt/5.10: update to -rt47 linux-yocto/5.10: enable TYPEC_TCPCI in usbc fragment
Chen Qi (1):
zstd: fix CVE_PRODUCT
Joe Slater (1):
util-linux: fix CVE 2021-37600
Jon Mason (1):
parselogs.py: qemuarm should be qemuarmv5
Khem Raj (1):
stress-ng: Drop defining daddr_t
Lee Chee Yang (2):
aspell: fix CVE-2019-25051
qemu: fix CVE-2021-3527
Matthias Klein (1):
runqemu: Fix typo in error message
Michael Opdenacker (3):
cve-check: fix comments
cve-check: update link to NVD website for CVE details
cve-check: improve comment about CVE patch file names
Mingli Yu (2):
curl: fix CVE-2021-22925
curl: fix CVES
Richard Purdie (3):
sstate: Fix rebuilds when changing layer config
license: Exclude COPYING.MIT from pseudo oeqa/runtime/cases/ptest: Increase test timeout from 300s to 450s
Ross Burton (1):
qemu: fix virtio vhost-user-gpu CVEs
hongxu (1):
createrepo-c: fix createrepo-c failed in nativesdk
meta/classes/cve-check.bbclass | 19 +-
meta/classes/license.bbclass | 2 +-
meta/classes/sstate.bbclass | 1 +
meta/lib/oeqa/runtime/cases/parselogs.py | 3 +-
meta/lib/oeqa/runtime/cases/ptest.py | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 1 +
.../util-linux/CVE-2021-37600.patch | 38 ++
.../createrepo-c/createrepo-c_0.17.0.bb | 4 +-
meta/recipes-devtools/qemu/qemu.inc | 9 +
...ix-memory-disclosure-in-virgl_cmd_ge.patch | 43 ++
...ix-resource-leak-in-vg_resource_crea.patch | 41 ++
...ix-memory-leak-in-vg_resource_attach.patch | 48 ++
...ix-memory-leak-while-calling-vg_reso.patch | 50 ++
...ix-memory-leak-in-virgl_cmd_resource.patch | 58 +++
...ix-memory-leak-in-virgl_resource_att.patch | 49 ++
...ix-OOB-write-in-virgl_cmd_get_capset.patch | 49 ++
.../qemu/qemu/CVE-2021-3527-1.patch | 42 ++
.../qemu/qemu/CVE-2021-3527-2.patch | 59 +++
.../stress-ng/stress-ng/no_daddr_t.patch | 32 --
.../stress-ng/stress-ng_0.12.05.bb | 2 -
meta/recipes-extended/zstd/zstd_1.4.9.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 +-
meta/recipes-support/aspell/aspell_0.60.8.bb | 4 +-
.../aspell/files/CVE-2019-25051.patch | 101 ++++
.../curl/curl/CVE-2021-22901.patch | 453 ++++++++++++++++++
.../curl/curl/CVE-2021-22924.patch | 298 ++++++++++++
.../curl/curl/CVE-2021-22925.patch | 50 ++
.../curl/curl/CVE-2021-22926.patch | 79 +++
meta/recipes-support/curl/curl_7.75.0.bb | 4 +
.../{nettle_3.7.2.bb => nettle_3.7.3.bb} | 2 +-
scripts/lib/devtool/upgrade.py | 3 +
scripts/runqemu | 2 +-
37 files changed, 1537 insertions(+), 87 deletions(-)
create mode 100644 meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch
delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
create mode 100644 meta/recipes-support/aspell/files/CVE-2019-25051.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22901.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22924.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22925.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22926.patch
rename meta/recipes-support/nettle/{nettle_3.7.2.bb => nettle_3.7.3.bb} (96%)Signature · 1 line
2.31.1
PATCH 1/23 stress-ng: Drop defining daddr_t
From: Khem Raj <[email protected]>
This is fixed differently upstream [1]
[1] https://github.com/ColinIanKing/stress-ng/commit/7e150ab18b0e8954ca426eb5366000a8f0d01110
--- .../stress-ng/stress-ng/no_daddr_t.patch | 32 ------------------- .../stress-ng/stress-ng_0.12.05.bb | 2 -- 2 files changed, 34 deletions(-) delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 9 Jun 2020 22:10:28 -0700 -Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined - -glibc defined daddr_t but musl does not, ideally it should not be used -and simple int type is enough. However, its better to leave glibc behavior -as it is and only define it to int if daddr_t is not provided by libc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> - ---- - stress-ng.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/stress-ng.h b/stress-ng.h -index 1a66293..802dc25 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -3763,6 +3763,10 @@ struct shim_statx { - uint64_t __spare2[14]; - }; - -+#ifndef __DADDR_T_TYPE -+typedef int daddr_t; -+#endif -+ - /* old ustat struct */ - struct shim_ustat { - #if defined(HAVE_DADDR_T)
meta/recipes-extended/stress-ng/stress-ng_0.12.05.bb +0 -2
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ - file://no_daddr_t.patch \ " SRC_URI[sha256sum] = "af7779aee38e6d94726ed7d5cf36384a64d50c86e42fff89c141d8609913f425"
@@ -24,4 +23,3 @@ do_install() { oe_runmake DESTDIR=${D} install ln -s stress-ng ${D}${bindir}/stress } -
Signature · 1 line
2.31.1
PATCH 2/23 parselogs.py: qemuarm should be qemuarmv5
In reply to Anuj MittalFrom: Jon Mason <[email protected]>
All of the errors being masked off for qemuarm are legacy from before the migration of qemuarm to qemuarmv5. Rename the machine to that to allow for qemuarmv5 to pass parselog test. Light testing shows no errors in dmesg for qemuarm.
--- meta/lib/oeqa/runtime/cases/parselogs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/runtime/cases/parselogs.py +2 -1
@@ -121,7 +121,7 @@ ignore_errors = { 'synth uevent: /devices/vio: failed to send uevent', 'PCI 0000:00 Cannot reserve Legacy IO [io 0x10000-0x10fff]', ] + common_errors, - 'qemuarm' : [ + 'qemuarmv5' : [ 'mmci-pl18x: probe of fpga:05 failed with error -22', 'mmci-pl18x: probe of fpga:0b failed with error -22', 'Failed to load module "glx"',
@@ -135,6 +135,7 @@ ignore_errors = { 'OF: amba_device_add() failed (-19) for /amba/fpga/sci@a000', 'Failed to initialize \'/amba/timer@101e3000\': -22', 'jitterentropy: Initialization failed with host not compliant with requirements: 2', + 'clcd-pl11x: probe of 10120000.display failed with error -2', ] + common_errors, 'qemuarm64' : [ 'Fatal server error:',
Signature · 1 line
2.31.1
PATCH 3/23 devtool: print a warning on upgrades if PREFERRED_VERSION is set
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
--- scripts/lib/devtool/upgrade.py | 3 +++ 1 file changed, 3 insertions(+)
scripts/lib/devtool/upgrade.py +3 -0
@@ -582,6 +582,9 @@ def upgrade(args, config, basepath, workspace): logger.info('New recipe is %s' % rf) if license_diff: logger.info('License checksums have been updated in the new recipe; please refer to it for the difference between the old and the new license texts.') + preferred_version = rd.getVar('PREFERRED_VERSION_%s' % rd.getVar('PN')) + if preferred_version: + logger.warning('Version is pinned to %s via PREFERRED_VERSION; it may need adjustment to match the new version before any further steps are taken' % preferred_version) finally: tinfoil.shutdown() return 0
Signature · 1 line
2.31.1
PATCH 4/23 zstd: fix CVE_PRODUCT
In reply to Anuj MittalFrom: Chen Qi <[email protected]>
zstd uses 'zstandard' in NVD database. e.g. CVE-2021-24031
--- meta/recipes-extended/zstd/zstd_1.4.9.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/zstd/zstd_1.4.9.bb +2 -0
@@ -16,6 +16,8 @@ SRC_URI = "git://github.com/facebook/zstd.git;branch=release \ SRCREV = "e4558ffd1dc49399faf4ee5d85abed4386b4dcf5" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" +CVE_PRODUCT = "zstandard" + S = "${WORKDIR}/git" PACKAGECONFIG ??= ""
Signature · 1 line
2.31.1
PATCH 5/23 linux-yocto/5.10: update to v5.10.53
In reply to Anuj MittalFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits:
71046eac2db9 Linux 5.10.53
6cd9bd2a2ddb udp: annotate data races around unix_sk(sk)->gso_size
bfdb38a4268a drm/panel: nt35510: Do not fail if DSI read fails
0d90d8492fb9 perf test bpf: Free obj_buf
a9f36bf3613c bpf: Track subprog poke descriptors correctly and fix use-after-free 782d71e29b29 bpftool: Properly close va_list 'ap' by va_end() on error
2381b8e882d0 tools: bpf: Fix error in 'make -C tools/ bpf_install'
638632997c31 tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path
2fee3cf4c97b ipv6: tcp: drop silly ICMPv6 packet too big messages
ad4ba3404931 tcp: fix tcp_init_transfer() to not reset icsk_ca_initialized
d60f07bcb76f tcp: annotate data races around tp->mtu_info
ea66fcb29605 tcp: consistently disable header prediction for mptcp
c28c747e37db ARM: dts: tacoma: Add phase corrections for eMMC
e55160537d76 ARM: dts: aspeed: Fix AST2600 machines line names
ff4b8f35c96c kbuild: do not suppress Kconfig prompts for silent build
0d514185ae79 dma-buf/sync_file: Don't leak fences on merge failure
f33605908a9b net: fddi: fix UAF in fza_probe
66c73f187d1e net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave() 7d7d0e84ac0d Revert "mm/shmem: fix shmem_swapin() race with swapoff"
2179d96ec702 net: validate lwtstate->data before returning from skb_tunnel_info() b61d8814c477 net: send SYNACK packet with accepted fwmark
f2a062fcfe1d net: ti: fix UAF in tlan:remove_one
b560521eca03 net: qcom/emac: fix UAF in emac:remove
dbbf5b957bd9 net: moxa: fix UAF in moxart_mac_probe
88ff9ec9c67a net: ip_tunnel: fix mtu calculation for ETHER tunnel devices
846829e75db5 net: bcmgenet: Ensure all TX/RX queues DMAs are disabled
b9fa66072fee net: netdevsim: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops 59070cc43d1d net: bridge: sync fdb to new unicast-filtering ports
7b5a2910e782 net/sched: act_ct: remove and free nf_table callbacks
6d4476236f79 vmxnet3: fix cksum offload issues for tunnels with non-default udp ports c3bc9ce7d400 net/sched: act_ct: fix err check for nf_conntrack_confirm
fc40fdefd94a netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo 34365de50806 net: ipv6: fix return value of ip6_skb_dst_mtu
73146745ff28 net: dsa: mv88e6xxx: enable devlink ATU hash param for Topaz
a8c7ba368748 net: dsa: mv88e6xxx: enable .rmu_disable() on Topaz
14cd8ce80ad7 net: dsa: mv88e6xxx: use correct .stats_set_histogram() on Topaz
c657413dcddf net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz
fcb970edc0be net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear
4e275a4aca68 usb: cdns3: Enable TDL_CHK only for OUT ep
ce6ee46e0f39 mm/page_alloc: fix memory map initialization for descending nodes 9e1cf2d1ed37 mm/userfaultfd: fix uffd-wp special cases for fork()
84ff5f66c3f6 mm/thp: simplify copying of huge zero page pmd when fork
a62177b35730 f2fs: Show casefolding support only when supported
277b311ae170 Revert "swap: fix do_swap_page() race with swapoff"
d92aa22f2419 arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file 0e67c76384e9 firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string e58c162789be cifs: prevent NULL deref in cifs_compose_mount_options()
faa3e7da487a s390: introduce proper type handling call_on_stack() macro
be10fff3a461 s390/traps: do not test MONITOR CALL without CONFIG_BUG
9beba1469996 thermal/core/thermal_of: Stop zone device before unregistering it 7412c988fe12 perf/x86/intel/uncore: Clean up error handling path of iio mapping 892387e7619e sched/fair: Fix CFS bandwidth hrtimer expiry type
eb859b043c2e scsi: qedf: Add check to synchronize abort and flush
a4a54c54af25 scsi: libfc: Fix array index out of bound exception
0d7596a954f1 scsi: libsas: Add LUN number check in .slave_alloc callback
2f8df6332eb2 scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 cdb995a6cbb5 rtc: max77686: Do not enforce (incorrect) interrupt trigger type
d3ba15fb0401 arch/arm64/boot/dts/marvell: fix NAND partitioning scheme
e378db118925 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set 8c12a3a68d4f thermal/drivers/sprd: Add missing of_node_put for loop iteration
20babcd83092 thermal/drivers/imx_sc: Add missing of_node_put for loop iteration 469951ce4bb0 thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1 bd40e2da3ae5 thermal/core: Correct function name thermal_zone_device_unregister() 6c099d595fd7 arm64: dts: imx8mq: assign PCIe clocks
24c41aa9d01b arm64: dts: ls208xa: remove bus-num from dspi node
7e3f5739cccb firmware: tegra: bpmp: Fix Tegra234-only builds
7c03982fa134 soc/tegra: fuse: Fix Tegra234-only builds
ffa6f08be14a ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured f40a7c9b8ee1 ARM: dts: stm32: fix stpmic node for stm32mp1 boards
2670d3d1ef47 ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N on DHCOM SoM 26cd441c529d ARM: dts: stm32: Drop unused linux,wakeup from touchscreen node on DHCOM SoM a5bc2a2d838e ARM: dts: stm32: fix the Odyssey SoM eMMC VQMMC supply
e27052f21a2f ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 6a7af6347810 ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings 160c92d728f3 ARM: dts: rockchip: fix supply properties in io-domains nodes
d671fae04648 arm64: dts: juno: Update SCPI nodes as per the YAML schema
fc71d8df5807 ARM: dts: bcm283x: Fix up GPIO LED node names
4bc03e321f2a ARM: dts: bcm283x: Fix up MMC node names
15d727c044d5 firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected b4009ea92f29 firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig
41e2bcca23f1 memory: tegra: Fix compilation warnings on 64bit platforms
7ad965c8a723 ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings ccec32f77144 ARM: dts: stm32: fix RCC node name on stm32f429 MCU
bfbc4b482078 ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards
34ec6702a2a1 ARM: dts: stm32: fix stm32mp157c-odyssey card detect pin
44f4e344f4f0 ARM: dts: stm32: Fix touchscreen node on dhcom-pdk2
3534a4b2d059 ARM: dts: stm32: Remove extra size-cells on dhcom-pdk2
8da771b5527c arm64: dts: qcom: sc7180: Move rmtfs memory region
a74d3bbe0553 ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant
e89f4098d528 ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees c8815d6fee79 arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction 28d2ae98154e ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names
a73a22a69f6a ARM: dts: am335x: fix ti,no-reset-on-init flag for gpios
ddf2d14894d0 ARM: dts: am437x-gp-evm: fix ti,no-reset-on-init flag for gpios
a09b4c444941 ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios 3f0948569997 kbuild: sink stdout from cmd for silent build
27582c9fa294 rtc: mxc_v2: add missing MODULE_DEVICE_TABLE
6f5891a560df ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value 5190a6604a10 ARM: dts: ux500: Fix orientation of accelerometer
61fda04276bb ARM: dts: ux500: Rename gpio-controller node
985947c53555 ARM: dts: ux500: Fix interrupt cells
ff9ef21bb6fb arm64: dts: rockchip: fix regulator-gpio states array
31e1b8c07d35 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info
d05ebeffca1d ARM: dts: imx6: phyFLEX: Fix UART hardware flow control
249d8e4ea168 ARM: dts: Hurricane 2: Fix NAND nodes names
f6541401dbd6 ARM: dts: BCM63xx: Fix NAND nodes names
b5fc6b9ab427 ARM: NSP: dts: fix NAND nodes names
5f844007eb91 ARM: Cygnus: dts: fix NAND nodes names
9525d58c5af8 ARM: brcmstb: dts: fix NAND nodes names
4e8eb51ae633 reset: ti-syscon: fix to_ti_syscon_reset_data macro
cabcb576fc3e arm64: dts: rockchip: Fix power-controller node names for rk3399
81ea23d988f9 arm64: dts: rockchip: Fix power-controller node names for rk3328
e4f97b740d6a arm64: dts: rockchip: Fix power-controller node names for px30
95b64be2e741 ARM: dts: rockchip: Fix power-controller node names for rk3288
5881af8d692b ARM: dts: rockchip: Fix power-controller node names for rk3188
70abb828312a ARM: dts: rockchip: Fix power-controller node names for rk3066a
fc01549d7b87 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x
55014c38e73d ARM: dts: rockchip: Fix the timer clocks order
2e1f681b680c arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi
7d3408c72336 ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 e2d1e4416174 ARM: dts: rockchip: Fix thermal sensor cells o rk322x
c8f0cef75dd7 ARM: dts: gemini: add device_type on pci
191523dcfa68 ARM: dts: gemini: rename mdio to the right name
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "dad5434fab65cdd316f940c5e9bd46e0d0607b5a" -SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" +SRCREV_machine ?= "e1b9700217e1dd963f9b034ffde9863abb53a92d" +SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" 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.52" +LINUX_VERSION ?= "5.10.53" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.52" +LINUX_VERSION ?= "5.10.53" 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 ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20" -SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d" -SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" +SRCREV_machine_qemuarm ?= "d5a79da206965b27043f558739b28a434efca75c" +SRCREV_machine ?= "f44b5bb716fdb6f804383fa087c9fdb54584cd5b" +SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.10.bb +12 -12
@@ -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 ?= "96a6083817785461bcabad63f3872d0a08b21c29" -SRCREV_machine_qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644" -SRCREV_machine_qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522" -SRCREV_machine_qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4" -SRCREV_machine_qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" -SRCREV_machine_qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" -SRCREV_machine_qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" -SRCREV_machine_qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" -SRCREV_machine_qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8" -SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" -SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" +SRCREV_machine_qemuarm ?= "c74da440f36f7073b1e99f42cb363031bb0c38ca" +SRCREV_machine_qemuarm64 ?= "e4e52d0a19fba26538218d78c70e54319ae00ca3" +SRCREV_machine_qemumips ?= "60118f08d49cd825d17f11b078d5848eb5bb7e6d" +SRCREV_machine_qemuppc ?= "eb3d2abf3d5aab1814d53767193770c282552774" +SRCREV_machine_qemuriscv64 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" +SRCREV_machine_qemuriscv32 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" +SRCREV_machine_qemux86 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" +SRCREV_machine_qemux86-64 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" +SRCREV_machine_qemumips64 ?= "643c332e487cfa1557d14050d6e1148d1c5d75da" +SRCREV_machine ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" +SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" # 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.52" +LINUX_VERSION ?= "5.10.53" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.31.1
PATCH 6/23 linux-yocto/5.4: update to v5.4.135
In reply to Anuj MittalFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:
0a0beb1f9120 Linux 5.4.135
d2f7b384a74f udp: annotate data races around unix_sk(sk)->gso_size
c72374978b3f perf test bpf: Free obj_buf
17bc942c0b96 bpftool: Properly close va_list 'ap' by va_end() on error 84ed8340941a ipv6: tcp: drop silly ICMPv6 packet too big messages
315033cab379 tcp: annotate data races around tp->mtu_info
41f45e91c92c dma-buf/sync_file: Don't leak fences on merge failure
04b06716838b net: fddi: fix UAF in fza_probe
8aa13a86964c net: validate lwtstate->data before returning from skb_tunnel_info() 8cff7b28ab05 net: send SYNACK packet with accepted fwmark
b7e5563f2a78 net: ti: fix UAF in tlan:remove_one
2b70ca92847c net: qcom/emac: fix UAF in emac:remove
463c0addb4eb net: moxa: fix UAF in moxart_mac_probe
7ac4a6a74e75 net: ip_tunnel: fix mtu calculation for ETHER tunnel devices d5dc50ca1f7a net: bcmgenet: Ensure all TX/RX queues DMAs are disabled 7ecd40801e5b net: bridge: sync fdb to new unicast-filtering ports
813d45499f51 net/sched: act_ct: fix err check for nf_conntrack_confirm 24973073562f netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo c6f4a71153f4 net: ipv6: fix return value of ip6_skb_dst_mtu
9872273b670a net: dsa: mv88e6xxx: enable .rmu_disable() on Topaz
6148ddff2dcb net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz d73c180e6add dm writecache: return the exact table values that were set 8a85afc6621a mm: slab: fix kmem_cache_create failed when sysfs node not destroyed f53729b828db usb: cdns3: Enable TDL_CHK only for OUT ep
52b01a808696 f2fs: Show casefolding support only when supported
91d846016729 arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file f696cc7f1bc8 firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string e2b28026b861 arm64: dts: armada-3720-turris-mox: add firmware node
f7d1fa65e742 cifs: prevent NULL deref in cifs_compose_mount_options() 06d8a7eb5803 s390: introduce proper type handling call_on_stack() macro 2a47e0719ae7 sched/fair: Fix CFS bandwidth hrtimer expiry type
5b7d065868a6 scsi: qedf: Add check to synchronize abort and flush
0fe70c15f943 scsi: libfc: Fix array index out of bound exception
d7b647d05586 scsi: libsas: Add LUN number check in .slave_alloc callback 863c4bc883d5 scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 712e9ed6134f rtc: max77686: Do not enforce (incorrect) interrupt trigger type 199d8ea4c7b1 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set 484193b635a7 thermal/core: Correct function name thermal_zone_device_unregister() 556cf0283035 arm64: dts: imx8mq: assign PCIe clocks
9d3eb68a5385 arm64: dts: ls208xa: remove bus-num from dspi node
e054b361caec firmware: tegra: bpmp: Fix Tegra234-only builds
94d009577033 soc/tegra: fuse: Fix Tegra234-only builds
270a2e9fafea ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 4bc66215bc22 ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings 856c753237ae ARM: dts: rockchip: fix supply properties in io-domains nodes c5bb9cc2ce23 arm64: dts: juno: Update SCPI nodes as per the YAML schema f572a9139396 ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings 95e795474c81 ARM: dts: stm32: fix RCC node name on stm32f429 MCU
a898aa9f88cc ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards 5c17edaaead7 ARM: dts: am437x-gp-evm: fix ti,no-reset-on-init flag for gpios 3446233096ff ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios e79e29a4e162 kbuild: sink stdout from cmd for silent build
f817d4677582 rtc: mxc_v2: add missing MODULE_DEVICE_TABLE
0a22b5178276 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info e20e85639e25 ARM: dts: imx6: phyFLEX: Fix UART hardware flow control a5b19d33ae22 ARM: dts: Hurricane 2: Fix NAND nodes names
f83535a47ff8 ARM: dts: BCM63xx: Fix NAND nodes names
cb05b84ad7f1 ARM: NSP: dts: fix NAND nodes names
14e3bad3b548 ARM: Cygnus: dts: fix NAND nodes names
587a757afe73 ARM: brcmstb: dts: fix NAND nodes names
a9c32c7aeee6 reset: ti-syscon: fix to_ti_syscon_reset_data macro
b400afa42739 arm64: dts: rockchip: Fix power-controller node names for rk3328 dfb4e8ed0792 arm64: dts: rockchip: Fix power-controller node names for px30 789070f17886 ARM: dts: rockchip: Fix power-controller node names for rk3288 6aaffe6ce8a9 ARM: dts: rockchip: Fix power-controller node names for rk3188 439115ee56d8 ARM: dts: rockchip: Fix power-controller node names for rk3066a 3b4c34728382 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x c9d29d62da59 ARM: dts: rockchip: Fix the timer clocks order
d105e15de610 arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi cfe3d29e5cde ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 79573c64410b ARM: dts: gemini: add device_type on pci
7037876393ce ARM: dts: gemini: rename mdio to the right name
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "849a67646d942d3a6d706f456df39954367ac7bf" -SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" +SRCREV_machine ?= "f4e30367bf1e579ff497fc9e7a16010c879048dc" +SRCREV_meta ?= "231d3a07e10680c7c89ea101cd803b0684482b11" 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.134" +LINUX_VERSION ?= "5.4.135" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.134" +LINUX_VERSION ?= "5.4.135" 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 ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92" -SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7" -SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" +SRCREV_machine_qemuarm ?= "fa414639057bbad7acd21a1a70a3847f9be469c0" +SRCREV_machine ?= "c81f0e376b1fce7a1198eec7b286966d98eae44d" +SRCREV_meta ?= "231d3a07e10680c7c89ea101cd803b0684482b11" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
@@ -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 ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" -SRCREV_machine_qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" -SRCREV_machine_qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" -SRCREV_machine_qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" -SRCREV_machine_qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" -SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" +SRCREV_machine_qemuarm ?= "f367cbe6d0c21c65257c66a4c9b1845fd43285f8" +SRCREV_machine_qemuarm64 ?= "8dcb7ee83e58da8bf51ed8b72165e1ed35beb928" +SRCREV_machine_qemumips ?= "3d4c6263bfdf95960894b75c76aa450d240e3e8e" +SRCREV_machine_qemuppc ?= "125a824c8d14c49b640bc0d6e040d495177caa10" +SRCREV_machine_qemuriscv64 ?= "997c04e7a40084a53bc3d45490949584364697bd" +SRCREV_machine_qemux86 ?= "997c04e7a40084a53bc3d45490949584364697bd" +SRCREV_machine_qemux86-64 ?= "997c04e7a40084a53bc3d45490949584364697bd" +SRCREV_machine_qemumips64 ?= "7082f58984404a5aad90bca1dac4e27773fff26e" +SRCREV_machine ?= "997c04e7a40084a53bc3d45490949584364697bd" +SRCREV_meta ?= "231d3a07e10680c7c89ea101cd803b0684482b11" # 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.134" +LINUX_VERSION ?= "5.4.135" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.31.1
PATCH 7/23 linux-yocto-rt/5.10: update to -rt47
In reply to Anuj MittalFrom: Bruce Ashfield <[email protected]>
Integrating the following commit(s) to linux-yocto/5.10:
969fef49cbbc Linux 5.10.52-rt47
bb5ff998ba62 Linux 5.10.47-rt46
340f6b6cdd37 sched: Don't defer CPU pick to migration_cpu_stop() f3d0be7cdae8 sched: Simplify set_affinity_pending refcounts 6b28888ca42a sched: Fix affine_move_task() self-concurrency ea66e426a3b7 sched: Optimize migration_cpu_stop() ac73ac41db62 sched: Collate affine_move_task() stoppers 6963e6b6e008 sched: Simplify migration_cpu_stop() d3a5a12fd350 sched: Fix migration_cpu_stop() requeueing 28dda3752954 Linux 5.10.47-rt45
d5f6c5f008ee Linux 5.10.44-rt44
ec9978fdc6aa Linux 5.10.42-rt43
--- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +1 -1
@@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1b9700217e1dd963f9b034ffde9863abb53a92d" +SRCREV_machine ?= "969fef49cbbc8639e9622e6a0655337fbfcc7627" SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
Signature · 1 line
2.31.1
PATCH 8/23 linux-yocto/5.10: enable TYPEC_TCPCI in usbc fragment
In reply to Anuj MittalFrom: Bruce Ashfield <[email protected]>
To make the usbc fragment more generally usable, we enable the Type-C Port Controller driver for TCPCI-compliant controller.
--- 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 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +1 -1
@@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "969fef49cbbc8639e9622e6a0655337fbfcc7627" -SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" +SRCREV_meta ?= "3f38ad49cf38519dc4492a3f802b743fde7b467e" 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}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +1 -1
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "d5a79da206965b27043f558739b28a434efca75c" SRCREV_machine ?= "f44b5bb716fdb6f804383fa087c9fdb54584cd5b" -SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" +SRCREV_meta ?= "3f38ad49cf38519dc4492a3f802b743fde7b467e" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.10.bb +1 -1
@@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" SRCREV_machine_qemux86-64 ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" SRCREV_machine_qemumips64 ?= "643c332e487cfa1557d14050d6e1148d1c5d75da" SRCREV_machine ?= "0b44b705c4f7d5c83e562dd7036cb5188d622285" -SRCREV_meta ?= "26a2a3cf764dde593325b8c08024f5990a5f6f02" +SRCREV_meta ?= "3f38ad49cf38519dc4492a3f802b743fde7b467e" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.31.1
PATCH 9/23 sstate: Fix rebuilds when changing layer config
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
When adding a layer which changed SSTATE_EXCLUDEDEPS_SYSROOT, the state hashes were changing when they should not. This was caused by wider use of setscene_depvalid which means the dependency on the variable was seen when it was previously not.
Exclude the variable since this should be be included in the hashes.
--- meta/classes/sstate.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/sstate.bbclass +1 -0
@@ -1018,6 +1018,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, bb.parse.siggen.checkhashes(sq_data, missed, found, d) return found +setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT" BB_SETSCENE_DEPVALID = "setscene_depvalid"
Signature · 1 line
2.31.1
PATCH 10/23 license: Exclude COPYING.MIT from pseudo
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
Along with the other license exclusions, we need to exclude the top level COPYING.MIT file else when:
COPY_LIC_DIRS = "1"COPY_LIC_MANIFEST = "1"
is set, we see eSDK failures from a pseudo abort.
[YOCTO #14366]
--- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +1 -1
@@ -31,7 +31,7 @@ python do_populate_lic() { f.write("%s: %s\n" % (key, info[key])) } -PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '')).split())}" +PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '') + ' ' + d.getVar('COREBASE') + '/meta/COPYING').split())}" # it would be better to copy them in do_install_append, but find_license_filesa is python python perform_packagecopy_prepend () { enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d)
Signature · 1 line
2.31.1
PATCH 11/23 runqemu: Fix typo in error message
In reply to Anuj MittalFrom: Matthias Klein <[email protected]>
--- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runqemu +1 -1
@@ -775,7 +775,7 @@ class BaseConfig(object): raise RunQemuError('BIOS not found: %s' % bios_match_name) if not os.path.exists(self.bios): - raise RunQemuError("KERNEL %s not found" % self.bios) + raise RunQemuError("BIOS %s not found" % self.bios) def check_mem(self):
Signature · 1 line
2.31.1
PATCH 12/23 aspell: fix CVE-2019-25051
In reply to Anuj MittalFrom: Lee Chee Yang <[email protected]>
--- meta/recipes-support/aspell/aspell_0.60.8.bb | 4 +- .../aspell/files/CVE-2019-25051.patch | 101 ++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/aspell/files/CVE-2019-25051.patch
meta/recipes-support/aspell/aspell_0.60.8.bb +3 -1
@@ -13,7 +13,9 @@ HOMEPAGE = "http://aspell.net/" LICENSE = "LGPLv2 | LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ + file://CVE-2019-25051.patch \ +" SRC_URI[md5sum] = "012fa9209203ae4e5a61c2a668fd10e3" SRC_URI[sha256sum] = "f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2"
meta/recipes-support/aspell/files/CVE-2019-25051.patch new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 13/23 createrepo-c: fix createrepo-c failed in nativesdk
In reply to Anuj MittalFrom: hongxu <[email protected]>
In sdk, call createrepo-c failed with:
...
$ createrepo_c --update ./test_repo/rpm Directory walk started Critical: Failed to detect compression for file ./test_repo/rpm/cortexa72/hello-2.10-r0.cortexa72.rpm: magic_load() failed: could not find any valid magic files! ...
Since commit [ea666fbc74 createrepo-c: set path to magic database for native and nativesdk] applied, the MAGIC is incorrectly assigned.
The variable datadir will be expanded automatically for nativesdk, do not need to add prefix ${SDKPATHNATIVE} to MAGIC
--- meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb +2 -2
@@ -33,8 +33,8 @@ do_install_append_class-native() { do_install_append_class-nativesdk() { create_wrapper ${D}/${bindir}/createrepo_c \ RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + MAGIC=${datadir}/misc/magic.mgc create_wrapper ${D}/${bindir}/modifyrepo_c \ - MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + MAGIC=${datadir}/misc/magic.mgc rm -rf ${D}/etc }
Signature · 1 line
2.31.1
PATCH 14/23 oeqa/runtime/cases/ptest: Increase test timeout from 300s to 450s
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
Some tests such as lttng-tools are marginal and timing out on the autobuilder with the current 300s default. Increase to avoid this noise in the ptest failures list.
--- meta/lib/oeqa/runtime/cases/ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/runtime/cases/ptest.py +1 -1
@@ -57,7 +57,7 @@ class PtestRunnerTest(OERuntimeTestCase): ptest_dirs = [ '/usr/lib' ] if not libdir in ptest_dirs: ptest_dirs.append(libdir) - status, output = self.target.run('ptest-runner -d \"{}\"'.format(' '.join(ptest_dirs)), 0) + status, output = self.target.run('ptest-runner -t 450 -d \"{}\"'.format(' '.join(ptest_dirs)), 0) os.makedirs(ptest_log_dir) with open(ptest_runner_log, 'w') as f: f.write(output)
Signature · 1 line
2.31.1
PATCH 15/23 cve-check: fix comments
In reply to Anuj MittalFrom: Michael Opdenacker <[email protected]>
This implements various fixes in comments in cve-check.bbclass In particular, the "whitlisted" typo is important as the "whitelisted" word is going to be replaced in a near future.
--- meta/classes/cve-check.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/cve-check.bbclass +4 -4
@@ -20,7 +20,7 @@ # the only method to check against CVEs. Running this tool # doesn't guarantee your packages are free of CVEs. -# The product name that the CVE database uses. Defaults to BPN, but may need to +# The product name that the CVE database uses defaults to BPN, but may need to # be overriden per recipe (for example tiff.bb sets CVE_PRODUCT=libtiff). CVE_PRODUCT ??= "${BPN}" CVE_VERSION ??= "${PV}"
@@ -56,11 +56,11 @@ CVE_CHECK_WHITELIST ?= "" # Layers to be excluded CVE_CHECK_LAYER_EXCLUDELIST ??= "" -# Layers to be included +# Layers to be included CVE_CHECK_LAYER_INCLUDELIST ??= "" -# set to "alphabetical" for version using single alphabetical character as increament release +# set to "alphabetical" for version using single alphabetical character as increment release CVE_VERSION_SUFFIX ??= "" python cve_save_summary_handler () {
@@ -230,7 +230,7 @@ def check_cves(d, patched_cves): return ([], [], []) pv = d.getVar("CVE_VERSION").split("+git")[0] - # If the recipe has been whitlisted we return empty lists + # If the recipe has been whitelisted we return empty lists if pn in d.getVar("CVE_CHECK_PN_WHITELIST").split(): bb.note("Recipe has been whitelisted, skipping check") return ([], [], [])
Signature · 1 line
2.31.1
PATCH 16/23 cve-check: update link to NVD website for CVE details
In reply to Anuj MittalFrom: Michael Opdenacker <[email protected]>
The old URL schema
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-ID
now redirects to
https://nvd.nist.gov/vuln/detail/CVE-ID
--- meta/classes/cve-check.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/cve-check.bbclass +1 -1
@@ -355,7 +355,7 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data): if include_layers and layer not in include_layers: return - nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId=" + nvd_link = "https://nvd.nist.gov/vuln/detail/" write_string = "" unpatched_cves = [] bb.utils.mkdirhier(os.path.dirname(cve_file))
Signature · 1 line
2.31.1
PATCH 17/23 cve-check: improve comment about CVE patch file names
In reply to Anuj MittalFrom: Michael Opdenacker <[email protected]>
--- meta/classes/cve-check.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta/classes/cve-check.bbclass +6 -3
@@ -166,9 +166,12 @@ def get_patches_cves(d): pn = d.getVar("PN") cve_match = re.compile("CVE:( CVE\-\d{4}\-\d+)+") - # Matches last CVE-1234-211432 in the file name, also if written - # with small letters. Not supporting multiple CVE id's in a single - # file name. + # Matches the last "CVE-YYYY-ID" in the file name, also if written + # in lowercase. Possible to have multiple CVE IDs in a single + # file name, but only the last one will be detected from the file name. + # However, patch files contents addressing multiple CVE IDs are supported + # (cve_match regular expression) + cve_file_name_match = re.compile(".*([Cc][Vv][Ee]\-\d{4}\-\d+)") patched_cves = set()
Signature · 1 line
2.31.1
PATCH 18/23 curl: fix CVE-2021-22925
In reply to Anuj MittalFrom: Mingli Yu <[email protected]>
CVE-2021-22925
--- .../curl/curl/CVE-2021-22925.patch | 50 +++++++++++++++++++ meta/recipes-support/curl/curl_7.75.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22925.patch
meta/recipes-support/curl/curl/CVE-2021-22925.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 894f6ec730597eb243618d33cc84d71add8d6a8a Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +Date: Sat, 12 Jun 2021 18:25:15 +0200 +Subject: [PATCH] telnet: fix option parser to not send uninitialized contents + +CVE-2021-22925 + +Reported-by: Red Hat Product Security +Bug: https://curl.se/docs/CVE-2021-22925.html + +CVE: CVE-2021-22925 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/894f6ec730597eb243618d33cc84d71add8d6a8a] + +Signed-off-by: Mingli Yu <[email protected]> +--- + lib/telnet.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/lib/telnet.c b/lib/telnet.c +index 1d3024ec4..a81bb81c3 100644 +--- a/lib/telnet.c ++++ b/lib/telnet.c +@@ -920,12 +920,17 @@ static void suboption(struct Curl_easy *data) + size_t tmplen = (strlen(v->data) + 1); + /* Add the variable only if it fits */ + if(len + tmplen < (int)sizeof(temp)-6) { +- if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) { +- msnprintf((char *)&temp[len], sizeof(temp) - len, +- "%c%s%c%s", CURL_NEW_ENV_VAR, varname, +- CURL_NEW_ENV_VALUE, varval); +- len += tmplen; +- } ++ int rv; ++ char sep[2] = ""; ++ varval[0] = 0; ++ rv = sscanf(v->data, "%127[^,]%1[,]%127s", varname, sep, varval); ++ if(rv == 1) ++ len += msnprintf((char *)&temp[len], sizeof(temp) - len, ++ "%c%s", CURL_NEW_ENV_VAR, varname); ++ else if(rv >= 2) ++ len += msnprintf((char *)&temp[len], sizeof(temp) - len, ++ "%c%s%c%s", CURL_NEW_ENV_VAR, varname, ++ CURL_NEW_ENV_VALUE, varval); + } + } + msnprintf((char *)&temp[len], sizeof(temp) - len, +-- +2.17.1 +
meta/recipes-support/curl/curl_7.75.0.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://vtls-fix-warning.patch \ file://CVE-2021-22898.patch \ file://CVE-2021-22897.patch \ + file://CVE-2021-22925.patch \ " SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"
Signature · 1 line
2.31.1
PATCH 19/23 curl: fix CVES
In reply to Anuj MittalFrom: Mingli Yu <[email protected]>
Backport patches to fix below CVEs:
CVE-2021-22901
CVE-2021-22924
CVE-2021-22926
--- .../curl/curl/CVE-2021-22901.patch | 453 ++++++++++++++++++ .../curl/curl/CVE-2021-22924.patch | 298 ++++++++++++ .../curl/curl/CVE-2021-22926.patch | 79 +++ meta/recipes-support/curl/curl_7.75.0.bb | 3 + 4 files changed, 833 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22901.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22924.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2021-22926.patch
meta/recipes-support/curl/curl/CVE-2021-22901.patch new file +453 -0
@@ -0,0 +1,453 @@ +From a801ebdc2b1c008fa72c31f1bf7773d99e6e2a2d Mon Sep 17 00:00:00 2001 +From: Harry Sintonen <[email protected]> +Date: Tue, 3 Aug 2021 08:41:45 +0000 +Subject: [PATCH] openssl: associate/detach the transfer from connection + +CVE-2021-22901 + +Bug: https://curl.se/docs/CVE-2021-22901.html + +CVE: CVE-2021-22901 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/7f4a9a9b2a49547eae24d2e19bc5c346e9026479] + +Signed-off-by: Mingli Yu <[email protected]> +--- + lib/multi.c | 5 +- + lib/vtls/gskit.c | 4 +- + lib/vtls/gtls.c | 4 +- + lib/vtls/mbedtls.c | 4 +- + lib/vtls/mesalink.c | 4 +- + lib/vtls/nss.c | 4 +- + lib/vtls/openssl.c | 146 +++++++++++++++++++++++++++++++------------ + lib/vtls/schannel.c | 6 +- + lib/vtls/sectransp.c | 4 +- + lib/vtls/vtls.c | 23 ++++++- + lib/vtls/vtls.h | 12 ++++ + lib/vtls/wolfssl.c | 4 +- + 12 files changed, 170 insertions(+), 50 deletions(-) + +diff --git a/lib/multi.c b/lib/multi.c +index 85707a1..a4ff9ac 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -875,8 +875,10 @@ bool Curl_multiplex_wanted(const struct Curl_multi *multi) + void Curl_detach_connnection(struct Curl_easy *data) + { + struct connectdata *conn = data->conn; +- if(conn) ++ if(conn) { + Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL); ++ Curl_ssl_detach_conn(data, conn); ++ } + data->conn = NULL; + } + +@@ -893,6 +895,7 @@ void Curl_attach_connnection(struct Curl_easy *data, + data->conn = conn; + Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data, + &data->conn_queue); ++ Curl_ssl_associate_conn(data, conn); + } + + static int waitconnect_getsock(struct connectdata *conn, +diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c +index 9b5f649..bd9c602 100644 +--- a/lib/vtls/gskit.c ++++ b/lib/vtls/gskit.c +@@ -1282,7 +1282,9 @@ const struct Curl_ssl Curl_ssl_gskit = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_GSKIT */ +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index 28ca528..24e036b 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -1683,7 +1683,9 @@ const struct Curl_ssl Curl_ssl_gnutls = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- gtls_sha256sum /* sha256sum */ ++ gtls_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_GNUTLS */ +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index bd0e080..fc973c7 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -1112,7 +1112,9 @@ const struct Curl_ssl Curl_ssl_mbedtls = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- mbedtls_sha256sum /* sha256sum */ ++ mbedtls_sha256sumi, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_MBEDTLS */ +diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c +index ad807d3..8a91487 100644 +--- a/lib/vtls/mesalink.c ++++ b/lib/vtls/mesalink.c +@@ -666,7 +666,9 @@ const struct Curl_ssl Curl_ssl_mesalink = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif +diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c +index e5ab71c..fb9f763 100644 +--- a/lib/vtls/nss.c ++++ b/lib/vtls/nss.c +@@ -2444,7 +2444,9 @@ const struct Curl_ssl Curl_ssl_nss = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + nss_false_start, /* false_start */ +- nss_sha256sum /* sha256sum */ ++ nss_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_NSS */ +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 8304264..946b4c5 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -244,6 +244,10 @@ struct ssl_backend_data { + #endif + }; + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ + /* + * Number of bytes to read from the random number seed file. This must be + * a finite value (because some entropy "files" like /dev/urandom have +@@ -2527,6 +2531,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + curl_socket_t sockfd = conn->sock[sockindex]; + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + ctx_option_t ctx_options = 0; ++ void *ssl_sessionid = NULL; + + #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + bool sni; +@@ -3224,46 +3229,23 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + } + #endif + +- /* Check if there's a cached ID we can/should use here! */ +- if(SSL_SET_OPTION(primary.sessionid)) { +- void *ssl_sessionid = NULL; +- int data_idx = ossl_get_ssl_data_index(); +- int connectdata_idx = ossl_get_ssl_conn_index(); +- int sockindex_idx = ossl_get_ssl_sockindex_index(); +- int proxy_idx = ossl_get_proxy_index(); +- +- if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && +- proxy_idx >= 0) { +- /* Store the data needed for the "new session" callback. +- * The sockindex is stored as a pointer to an array element. */ +- SSL_set_ex_data(backend->handle, data_idx, data); +- SSL_set_ex_data(backend->handle, connectdata_idx, conn); +- SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); +-#ifndef CURL_DISABLE_PROXY +- SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: +- NULL); +-#else +- SSL_set_ex_data(backend->handle, proxy_idx, NULL); +-#endif +- +- } ++ ossl_associate_connection(data, conn, sockindex); + +- Curl_ssl_sessionid_lock(data); +- if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, +- &ssl_sessionid, NULL, sockindex)) { +- /* we got a session id, use it! */ +- if(!SSL_set_session(backend->handle, ssl_sessionid)) { +- Curl_ssl_sessionid_unlock(data); +- failf(data, "SSL: SSL_set_session failed: %s", +- ossl_strerror(ERR_get_error(), error_buffer, +- sizeof(error_buffer))); +- return CURLE_SSL_CONNECT_ERROR; +- } +- /* Informational message */ +- infof(data, "SSL re-using session ID\n"); ++ Curl_ssl_sessionid_lock(data); ++ if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { ++ /* we got a session id, use it! */ ++ if(!SSL_set_session(backend->handle, ssl_sessionid)) { ++ Curl_ssl_sessionid_unlock(data); ++ failf(data, "SSL: SSL_set_session failed: %s", ++ ossl_strerror(ERR_get_error(), error_buffer, ++ sizeof(error_buffer))); ++ return CURLE_SSL_CONNECT_ERROR; + } +- Curl_ssl_sessionid_unlock(data); ++ /* Informational message */ ++ infof(data, "SSL re-using session ID\n"); + } ++ Curl_ssl_sessionid_unlock(data); + + #ifndef CURL_DISABLE_PROXY + if(conn->proxy_ssl[sockindex].use) { +@@ -4481,6 +4463,90 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl, + (void *)backend->ctx : (void *)backend->handle; + } + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex) ++{ ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Store the data needed for the "new session" callback. ++ * The sockindex is stored as a pointer to an array element. */ ++ SSL_set_ex_data(backend->handle, data_idx, data); ++ SSL_set_ex_data(backend->handle, connectdata_idx, conn); ++ SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); ++#ifndef CURL_DISABLE_PROXY ++ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: ++ NULL); ++#else ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++#endif ++ } ++ } ++} ++ ++/* ++ * Starting with TLS 1.3, the ossl_new_session_cb callback gets called after ++ * the handshake. If the transfer that sets up the callback gets killed before ++ * this callback arrives, we must make sure to properly clear the data to ++ * avoid UAF problems. A future optimization could be to instead store another ++ * transfer that might still be using the same connection. ++ */ ++ ++static void ossl_disassociate_connection(struct Curl_easy *data, ++ int sockindex) ++{ ++ struct connectdata *conn = data->conn; ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ bool isproxy = FALSE; ++ bool incache; ++ void *old_ssl_sessionid = NULL; ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Invalidate the session cache entry, if any */ ++ isproxy = SSL_get_ex_data(backend->handle, proxy_idx) ? TRUE : FALSE; ++ ++ /* Disable references to data in "new session" callback to avoid ++ * accessing a stale pointer. */ ++ SSL_set_ex_data(backend->handle, data_idx, NULL); ++ SSL_set_ex_data(backend->handle, connectdata_idx, NULL); ++ SSL_set_ex_data(backend->handle, sockindex_idx, NULL); ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++ } ++ ++ Curl_ssl_sessionid_lock(data); ++ incache = !(Curl_ssl_getsessionid(data, conn, isproxy, ++ &old_ssl_sessionid, NULL, sockindex)); ++ if(incache) ++ Curl_ssl_delsessionid(data, old_ssl_sessionid); ++ Curl_ssl_sessionid_unlock(data); ++ } ++} ++ + const struct Curl_ssl Curl_ssl_openssl = { + { CURLSSLBACKEND_OPENSSL, "openssl" }, /* info */ + +@@ -4514,10 +4580,12 @@ const struct Curl_ssl Curl_ssl_openssl = { + ossl_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ + #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256) +- ossl_sha256sum /* sha256sum */ ++ ossl_sha256sum, /* sha256sum */ + #else +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ + #endif ++ ossl_associate_connection, /* associate_connection */ ++ ossl_disassociate_connection /* disassociate_connection */ + }; + + #endif /* USE_OPENSSL */ +diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c +index 670310d..596106a 100644 +--- a/lib/vtls/schannel.c ++++ b/lib/vtls/schannel.c +@@ -325,7 +325,7 @@ get_alg_id_by_name(char *name) + + static CURLcode + set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers, +- int *algIds) ++ ALG_ID *algIds) + { + char *startCur = ciphers; + int algCount = 0; +@@ -2429,7 +2429,9 @@ const struct Curl_ssl Curl_ssl_schannel = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- schannel_sha256sum /* sha256sum */ ++ schannel_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_SCHANNEL */ +diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c +index 6d1ea7e..37b41f8 100644 +--- a/lib/vtls/sectransp.c ++++ b/lib/vtls/sectransp.c +@@ -3311,7 +3311,9 @@ const struct Curl_ssl Curl_ssl_sectransp = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + sectransp_false_start, /* false_start */ +- sectransp_sha256sum /* sha256sum */ ++ sectransp_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #ifdef __clang__ +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index 00b6268..59a7efb 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -579,6 +579,25 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + return CURLE_OK; + } + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->associate_connection) { ++ Curl_ssl->associate_connection(data, conn, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET); ++ } ++} ++ ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->disassociate_connection) { ++ Curl_ssl->disassociate_connection(data, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->disassociate_connection(data, SECONDARYSOCKET); ++ } ++} + + void Curl_ssl_close_all(struct Curl_easy *data) + { +@@ -1212,7 +1231,9 @@ static const struct Curl_ssl Curl_ssl_multi = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + const struct Curl_ssl *Curl_ssl = +diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h +index 1351215..94049f9 100644 +--- a/lib/vtls/vtls.h ++++ b/lib/vtls/vtls.h +@@ -75,6 +75,11 @@ struct Curl_ssl { + bool (*false_start)(void); + CURLcode (*sha256sum)(const unsigned char *input, size_t inputlen, + unsigned char *sha256sum, size_t sha256sumlen); ++ ++ void (*associate_connection)(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ void (*disassociate_connection)(struct Curl_easy *data, int sockindex); + }; + + #ifdef USE_SSL +@@ -264,6 +269,11 @@ bool Curl_ssl_cert_status_request(void); + + bool Curl_ssl_false_start(void); + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++ + #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */ + + #else /* if not USE_SSL */ +@@ -290,6 +300,8 @@ bool Curl_ssl_false_start(void); + #define Curl_ssl_cert_status_request() FALSE + #define Curl_ssl_false_start() FALSE + #define Curl_ssl_tls13_ciphersuites() FALSE ++#define Curl_ssl_associate_conn(a,b) Curl_nop_stmt ++#define Curl_ssl_detach_conn(a,b) Curl_nop_stmt + #endif + + #endif /* HEADER_CURL_VTLS_H */ +diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c +index f1b12b1..f734a84 100644 +--- a/lib/vtls/wolfssl.c ++++ b/lib/vtls/wolfssl.c +@@ -1165,7 +1165,9 @@ const struct Curl_ssl Curl_ssl_wolfssl = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- wolfssl_sha256sum /* sha256sum */ ++ wolfssl_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif +-- +2.31.1 +
meta/recipes-support/curl/curl/CVE-2021-22924.patch new file +298 -0
298 lines not on this page · raw message
meta/recipes-support/curl/curl/CVE-2021-22926.patch new file +79 -0
79 lines not on this page · raw message
meta/recipes-support/curl/curl_7.75.0.bb +3 -0
@@ -18,6 +18,9 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://CVE-2021-22898.patch \ file://CVE-2021-22897.patch \ file://CVE-2021-22925.patch \ + file://CVE-2021-22901.patch \ + file://CVE-2021-22924.patch \ + file://CVE-2021-22926.patch \ " SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"
Signature · 1 line
2.31.1
PATCH 20/23 util-linux: fix CVE 2021-37600
In reply to Anuj MittalFrom: Joe Slater <[email protected]>
Backport patch, which should be in next release (2.37.2).
--- meta/recipes-core/util-linux/util-linux.inc | 1 + .../util-linux/CVE-2021-37600.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -36,5 +36,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch \ + file://CVE-2021-37600.patch \ " SRC_URI[sha256sum] = "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f"
meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 1c9143d0c1f979c3daf10e1c37b5b1e916c22a1c Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +Date: Tue, 27 Jul 2021 11:58:31 +0200 +Subject: [PATCH] sys-utils/ipcutils: be careful when call calloc() for uint64 + nmembs + +Fix: https://github.com/karelzak/util-linux/issues/1395 +Signed-off-by: Karel Zak <[email protected]> + +CVE: CVE-2021-37600 + +after version 2.37.1 +https://github.com/karelzak/util-linux.git 1c9143d0c1d... +unmodified + +Upstream-Status: Backport + +Signed-off-by: Joe Slater <[email protected]> +--- + sys-utils/ipcutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c +index e784c4d..18868cf 100644 +--- a/sys-utils/ipcutils.c ++++ b/sys-utils/ipcutils.c +@@ -218,7 +218,7 @@ static void get_sem_elements(struct sem_data *p) + { + size_t i; + +- if (!p || !p->sem_nsems || p->sem_perm.id < 0) ++ if (!p || !p->sem_nsems || p->sem_nsems > SIZE_MAX || p->sem_perm.id < 0) + return; + + p->elements = xcalloc(p->sem_nsems, sizeof(struct sem_elem)); +-- +2.7.4 +
Signature · 1 line
2.31.1
PATCH 21/23 qemu: fix virtio vhost-user-gpu CVEs
In reply to Anuj MittalFrom: Ross Burton <[email protected]>
Fix a slew of CVEs (CVE-2021-3544, CVE-2021-3545, CVE-2021-3546) by backporting the relevant patches from qemu's git.
(From OE-Core rev: ce850a5ce84f949d3114024c89ae3dd98fcbef41)
--- meta/recipes-devtools/qemu/qemu.inc | 7 +++ ...ix-memory-disclosure-in-virgl_cmd_ge.patch | 43 ++++++++++++++ ...ix-resource-leak-in-vg_resource_crea.patch | 41 +++++++++++++ ...ix-memory-leak-in-vg_resource_attach.patch | 48 +++++++++++++++ ...ix-memory-leak-while-calling-vg_reso.patch | 50 ++++++++++++++++ ...ix-memory-leak-in-virgl_cmd_resource.patch | 58 +++++++++++++++++++ ...ix-memory-leak-in-virgl_resource_att.patch | 49 ++++++++++++++++ ...ix-OOB-write-in-virgl_cmd_get_capset.patch | 49 ++++++++++++++++ 8 files changed, 345 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch
meta/recipes-devtools/qemu/qemu.inc +7 -0
@@ -57,6 +57,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-27821.patch \ file://CVE-2021-20263.patch \ file://CVE-2021-3392.patch \ + file://0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch \ + file://0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch \ + file://0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch \ + file://0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch \ + file://0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch \ + file://0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch \ + file://0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch new file +48 -0
48 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch new file +50 -0
50 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch new file +58 -0
58 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 22/23 qemu: fix CVE-2021-3527
In reply to Anuj MittalFrom: Lee Chee Yang <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2021-3527-1.patch | 42 +++++++++++++ .../qemu/qemu/CVE-2021-3527-2.patch | 59 +++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch
meta/recipes-devtools/qemu/qemu.inc +2 -0
@@ -64,6 +64,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch \ file://0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch \ file://0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch \ + file://CVE-2021-3527-1.patch \ + file://CVE-2021-3527-2.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch new file +59 -0
59 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 23/23 nettle: update 3.7.2 -> 3.7.3
In reply to Anuj MittalFrom: Alexander Kanavin <[email protected]>
fix CVE-2021-3580
(From OE-Core rev: 219c89310264f99c2c43bb80e437a8a1e8e3217a)
---
.../recipes-support/nettle/{nettle_3.7.2.bb => nettle_3.7.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/nettle/{nettle_3.7.2.bb => nettle_3.7.3.bb} (96%)meta/recipes-support/nettle/nettle_3.7.3.bb renamed from meta/recipes-support/nettle/nettle_3.7.2.bb +1 -1
@@ -24,7 +24,7 @@ SRC_URI_append_class-target = "\ file://dlopen-test.patch \ " -SRC_URI[sha256sum] = "8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162" +SRC_URI[sha256sum] = "661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0" UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.31.1