diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-28 09:47:58 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-01 21:57:34 +0100 |
commit | 8f3992b16f8f0507b2315aa7f2e6ee4639cf3f45 (patch) | |
tree | 23d6ab37e9bf09363fb4399de8238e3897021e00 /meta | |
parent | 326776b3e884353bda39673284445e72835dc6bd (diff) | |
download | poky-8f3992b16f8f0507b2315aa7f2e6ee4639cf3f45.tar.gz |
linux-yocto/5.15: Fix CVE-2022-28796
Integrating the following commit(s) to linux-yocto/5.15:
5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
(From OE-Core rev: 3a0d2acf249717416226c34b6147e5499adbda15)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index f503df6404..5cc1bdbff9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "5a5ffe1f47ec90c9778697a0b8dcc3145859fe61" | 14 | SRCREV_machine ?= "21f94b6c9601dbb03036d539482471ddbe753626" |
15 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 15 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 9a80353ee2..9c9d513f83 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -14,7 +14,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
14 | KMETA = "kernel-meta" | 14 | KMETA = "kernel-meta" |
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "c1ea4d56b597a4740b655e3535157fd3248b6dde" | 17 | SRCREV_machine ?= "2521f8951adffad70d844209b73cd8d8878710f1" |
18 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 18 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index fbb953f559..d9b09660c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -13,16 +13,16 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" | |||
13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" |
14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine:qemuarm ?= "3954bbe99f0b517dafa413d88609d0c6f28e9790" | 16 | SRCREV_machine:qemuarm ?= "5dab48a9c4bb681646b06004bc081cc5b4e65285" |
17 | SRCREV_machine:qemuarm64 ?= "e0f74df7acce2888931dbd6800b1503244155879" | 17 | SRCREV_machine:qemuarm64 ?= "fc0cae7371697d26cda76f46d352648a0d8a8fd8" |
18 | SRCREV_machine:qemumips ?= "8b632ac1df6b6f9dd61bce1479f6b48847326bee" | 18 | SRCREV_machine:qemumips ?= "58617a04ab52b58a5393b5088a3199c3d28b7a15" |
19 | SRCREV_machine:qemuppc ?= "ff7d30e3eabd702f870e10be7411d8dadb7bfdf8" | 19 | SRCREV_machine:qemuppc ?= "fdf86234f2a35c3fe2457ee02847b4351fdeb08b" |
20 | SRCREV_machine:qemuriscv64 ?= "a2cf1b2c0fab8c9907b50a5fab4f0757bc236afe" | 20 | SRCREV_machine:qemuriscv64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
21 | SRCREV_machine:qemuriscv32 ?= "a2cf1b2c0fab8c9907b50a5fab4f0757bc236afe" | 21 | SRCREV_machine:qemuriscv32 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
22 | SRCREV_machine:qemux86 ?= "a2cf1b2c0fab8c9907b50a5fab4f0757bc236afe" | 22 | SRCREV_machine:qemux86 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
23 | SRCREV_machine:qemux86-64 ?= "a2cf1b2c0fab8c9907b50a5fab4f0757bc236afe" | 23 | SRCREV_machine:qemux86-64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
24 | SRCREV_machine:qemumips64 ?= "5a1907849e651536a7eef3e1d5bc1a51f5cebb7a" | 24 | SRCREV_machine:qemumips64 ?= "0294ba0989f839fb11c41fb887707cb49d20143e" |
25 | SRCREV_machine ?= "a2cf1b2c0fab8c9907b50a5fab4f0757bc236afe" | 25 | SRCREV_machine ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" |
26 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" | 26 | SRCREV_meta ?= "178b786485dfb3edb05af51f0ba9195ffa07e358" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |