summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-09-14 09:47:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-17 23:23:21 +0100
commit2a65dc3229e8600a550329d57037572d98da7609 (patch)
treed92b46b0fc8f2ff02b9233b901ee73ae493ef085
parent00524a22592a63cf3c996775d73f2d8a5d97b23f (diff)
downloadpoky-2a65dc3229e8600a550329d57037572d98da7609.tar.gz
linux-yocto/4.12: bluetooth: CVE-2017-1000251
Integrating the following commit: [ commit 16de0149674ed12d983b77a453852ac2e64584b4 Author: Ben Seri <ben@armis.com> Date: Sat Sep 9 23:15:59 2017 +0200 Bluetooth: Properly check L2CAP config option output buffer length Validate the output buffer length for L2CAP config requests and responses to avoid overflowing the stack buffer used for building the option blocks. Cc: stable@vger.kernel.org Signed-off-by: Ben Seri <ben@armis.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ] (From OE-Core rev: 04a59a5d8e96b145e094c101b87d40cc2d7a1a25) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.12.bb16
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
index 491e5b05a2..c49a9340f8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
@@ -11,7 +11,7 @@ python () {
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 14SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4"
15SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" 15SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
index 05debd338b..efd876aee5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.12.12"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 12SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4"
13SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" 13SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index d060e2496b..a2624090d3 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "42a4ca618610964560fcf6e4b6d7540f5449e992" 14SRCREV_machine_qemuarm ?= "67b62d8d7bd9f19f0f4fad044787d947ebc4ec25"
15SRCREV_machine_qemuarm64 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 15SRCREV_machine_qemuarm64 ?= "16de0149674ed12d983b77a453852ac2e64584b4"
16SRCREV_machine_qemumips ?= "9252e9261b0a606df2f3f49004c23f8a110962ad" 16SRCREV_machine_qemumips ?= "371926551d44c140a0fb869cec34762b40bdf1a6"
17SRCREV_machine_qemuppc ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 17SRCREV_machine_qemuppc ?= "16de0149674ed12d983b77a453852ac2e64584b4"
18SRCREV_machine_qemux86 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 18SRCREV_machine_qemux86 ?= "16de0149674ed12d983b77a453852ac2e64584b4"
19SRCREV_machine_qemux86-64 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 19SRCREV_machine_qemux86-64 ?= "16de0149674ed12d983b77a453852ac2e64584b4"
20SRCREV_machine_qemumips64 ?= "bbcf4a8ae8af56687938a7412a9da92f4d1b6552" 20SRCREV_machine_qemumips64 ?= "9d63d9c11c44ceabd452d7ee49cf55a88c39383f"
21SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" 21SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4"
22SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" 22SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \