diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-10-21 23:47:37 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-25 17:51:19 +0100 |
commit | 4fd9b03db4a201b0523a2aecf1cc97fc47b4b614 (patch) | |
tree | b43791b4808e9a30b4a1c3efef37c388670149b8 /meta | |
parent | d9f9b526d9945cca43e778beea6867f8810fbf30 (diff) | |
download | poky-4fd9b03db4a201b0523a2aecf1cc97fc47b4b614.tar.gz |
linux-yocto/4.1: fix CVE-2016-5195 (dirtycow)
Backporting commit 19be0eaffa [mm: remove gup_flags FOLL_WRITE games
from __get_user_pages()] to address the dirtycow exploit.
(From OE-Core rev: 8470ea4cfd5fca4c9573e39c7c3486aeb310990a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.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.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index ed7a916be9..b95fb58577 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,8 +11,8 @@ 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 | ||
14 | SRCREV_machine ?= "71daecbcd3f3e8fa73aa036a5539722004e7759c" | 14 | SRCREV_machine ?= "966ddde490030166010c5770f8f86cdd0e961c76" |
15 | SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" | 15 | SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 78600427b3..ba01702cb6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.33" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "a38cb202738a2b055ac216b3699cc9377edea45a" | 12 | SRCREV_machine ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" |
13 | SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" | 13 | SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 413234b6d5..788a8eaaa8 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "89241b98386f752ab073d3ab5518cb69bacbd97e" | 14 | SRCREV_machine_qemuarm ?= "d67ef485ce1420df11bda2d9f6fb78ef50c1adff" |
15 | SRCREV_machine_qemuarm64 ?= "a38cb202738a2b055ac216b3699cc9377edea45a" | 15 | SRCREV_machine_qemuarm64 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" |
16 | SRCREV_machine_qemumips ?= "e00505a0c07a352d1dd57adb8da1768863022979" | 16 | SRCREV_machine_qemumips ?= "65116339cfd210990c9c4710cdfec3ebd59abb0e" |
17 | SRCREV_machine_qemuppc ?= "d5ef1ced9d019d20d986e205bddc317961407188" | 17 | SRCREV_machine_qemuppc ?= "30816907653b57f1f3d5f9a7a2f6339bab14a680" |
18 | SRCREV_machine_qemux86 ?= "a38cb202738a2b055ac216b3699cc9377edea45a" | 18 | SRCREV_machine_qemux86 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" |
19 | SRCREV_machine_qemux86-64 ?= "a38cb202738a2b055ac216b3699cc9377edea45a" | 19 | SRCREV_machine_qemux86-64 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" |
20 | SRCREV_machine_qemumips64 ?= "ac476ecd7a56288e3e8ed1ef3872554de661e823" | 20 | SRCREV_machine_qemumips64 ?= "f7a0b532b6ac81757d85b0c9a928f45a87c9e364" |
21 | SRCREV_machine ?= "a38cb202738a2b055ac216b3699cc9377edea45a" | 21 | SRCREV_machine ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" |
22 | SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857" | 22 | SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |