From 2a65dc3229e8600a550329d57037572d98da7609 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 14 Sep 2017 09:47:00 -0400 Subject: linux-yocto/4.12: bluetooth: CVE-2017-1000251 Integrating the following commit: [ commit 16de0149674ed12d983b77a453852ac2e64584b4 Author: Ben Seri 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 Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds Signed-off-by: Bruce Ashfield ] (From OE-Core rev: 04a59a5d8e96b145e094c101b87d40cc2d7a1a25) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.12.bb | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta/recipes-kernel/linux') 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 () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" +SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" SRC_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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" +SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" PV = "${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" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "42a4ca618610964560fcf6e4b6d7540f5449e992" -SRCREV_machine_qemuarm64 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" -SRCREV_machine_qemumips ?= "9252e9261b0a606df2f3f49004c23f8a110962ad" -SRCREV_machine_qemuppc ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" -SRCREV_machine_qemux86 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" -SRCREV_machine_qemux86-64 ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" -SRCREV_machine_qemumips64 ?= "bbcf4a8ae8af56687938a7412a9da92f4d1b6552" -SRCREV_machine ?= "c86fccf85be960294703ca9882dde9ee62aaa9e4" +SRCREV_machine_qemuarm ?= "67b62d8d7bd9f19f0f4fad044787d947ebc4ec25" +SRCREV_machine_qemuarm64 ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_qemumips ?= "371926551d44c140a0fb869cec34762b40bdf1a6" +SRCREV_machine_qemuppc ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_qemux86 ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_qemux86-64 ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_qemumips64 ?= "9d63d9c11c44ceabd452d7ee49cf55a88c39383f" +SRCREV_machine ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_meta ?= "eda4d18ce4b259c84ccd5c249c3dc5958c16928c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ -- cgit v1.2.3-54-g00ecf