summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-12-16 22:38:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:43 +0000
commitd8276fb3af1eab51e0bf8076705b1410de9926f5 (patch)
tree1526f6a7a9c3c9f8f2ecb56884f63aa090534133 /meta
parent1118e24f23df4fa95519ccef03aacb7a22328868 (diff)
downloadpoky-d8276fb3af1eab51e0bf8076705b1410de9926f5.tar.gz
linux-yocto/4.18: integrate CVE fixes
Integrating the following CVE fixes into the 4.18 tree: e78a46f375fe cdrom: fix improper type cast, which can leat to information leak. 4815231b9b65 btrfs: tree-checker: Verify block_group_item 6dfe2fe5dd52 btrfs: Introduce mount time chunk <-> dev extent mapping check ccd06dcdc11b btrfs: Verify that every chunk has corresponding block group at mount time 7cf70b1e759a btrfs: Check that each block group has corresponding chunk at mount time 166bbd6ff86b btrfs: validate type when reading a chunk ecf31c809599 ip: frags: fix crash in ip_do_fragment() 02fc22c5eb30 ip: use rb trees for IP frag queue. 72dd075ee367 net: modify skb_rbtree_purge to return the truesize of all purged skbs. 7a9f904c49aa ip: discard IPv4 datagrams with overlapping segments. abea198657b7 f2fs: fix to do sanity check with i_extra_isize 408c425c41e4 f2fs: fix to do sanity check with node footer and iblocks 5e4ccef734c3 f2fs: fix to do sanity check with user_block_count (From OE-Core rev: e09309a50dd5f4d8fc75915a5f2e97a16603aa9a) (From OE-Core rev: 75e694bd12906a88894f6541ab490039204ec4e2) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@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_4.18.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.18.bb16
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
index 4bb25488d9..66da7e9e08 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.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
14SRCREV_machine ?= "5b9223498c5870c46d9c8bb87db649d00dad7abe" 14SRCREV_machine ?= "420a1d5ae972845413713ce882570f772423049f"
15SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3" 15SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
index d8e0a40f7b..2f1e935110 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "5b8abdbe6fb783fe30c835ff63008eb43257f32c" 18SRCREV_machine_qemuarm ?= "26f444925aa62171e79a155bec72f055502cbce2"
19SRCREV_machine ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 19SRCREV_machine ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
20SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3" 20SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
index 6097e43415..d01bbfd703 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "v4.18/standard/base"
11KBRANCH_qemux86-64 ?= "v4.18/standard/base" 11KBRANCH_qemux86-64 ?= "v4.18/standard/base"
12KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" 12KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "eb0ef26f2bac0cd84961eba7038e8ff10c6a6fb1" 14SRCREV_machine_qemuarm ?= "fc10a65e12d9c6d1e0c63e19688727bc72922cdd"
15SRCREV_machine_qemuarm64 ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 15SRCREV_machine_qemuarm64 ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
16SRCREV_machine_qemumips ?= "7f7ea78d7b783413033d6adf45ec8952f8c98d60" 16SRCREV_machine_qemumips ?= "d3ecc257838be6d1a15e1eb114ee960283bacf33"
17SRCREV_machine_qemuppc ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 17SRCREV_machine_qemuppc ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
18SRCREV_machine_qemux86 ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 18SRCREV_machine_qemux86 ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
19SRCREV_machine_qemux86-64 ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 19SRCREV_machine_qemux86-64 ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
20SRCREV_machine_qemumips64 ?= "db0ce433d9b74830d5b8dd3171ffbd7b1119cbfa" 20SRCREV_machine_qemumips64 ?= "48c3bf17f2c4699c9ee442c62ecdaad85fdb4232"
21SRCREV_machine ?= "218a2500084b70dfe9cedd3856ec572563d55ace" 21SRCREV_machine ?= "e78a46f375febc5f9305b6f94ae12fbf00b46330"
22SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3" 22SRCREV_meta ?= "5a99020e693eebe662ae0c4c08b65afedbd5cde3"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \