summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-02-14 19:13:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-14 22:58:45 (GMT)
commit3fefbe35c377efe777afb37a1b7403be5ce9a8ec (patch)
tree6298cef9d45b8865355de989c5d0e7a77b7656aa /meta
parent088677afc5097e11bb442b3c305a200c0a7f8277 (diff)
downloadpoky-3fefbe35c377efe777afb37a1b7403be5ce9a8ec.tar.gz
linux-yocto/3.10: arbitrary write with CONFIG_X86_X32 (CVE-2014-0038)
Integrating the upstream commit for CVE-2014-0038. (From OE-Core rev: 9073969d7b7d5d20377ab0c1a49f8e5bb051601b) 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_3.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb14
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 5e387a5..1c05772 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH = "standard/preempt-rt/base" 3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" 4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6SRCREV_machine ?= "6a0719e6623a22991fae0fa45e8949d7c79e7451" 6SRCREV_machine ?= "f6d02c6f5184c6be256edff161acbf29789c89d2"
7SRCREV_machine_qemuppc ?= "9742f3fd2260676ed73d0a1b4f1bc9fc621609ef" 7SRCREV_machine_qemuppc ?= "e883b7073c758d82e3b409ef98c35099ad69a63b"
8SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 8SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index 6b1cbc6..5e33b1f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.28"
9 9
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "25d0ebad3e2bf9f12bd6d386ead68e1f64ceaf29" 12SRCREV_machine ?= "e9cdab78bed262dbeadc7f403989f20972bcddde"
13SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 13SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index ee27db2..baea8ae 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -11,13 +11,13 @@ KBRANCH_qemux86 = "standard/common-pc/base"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base" 11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64" 12KBRANCH_qemumips64 = "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "ccf8a3041cd815d3b401000345176870903cf77f" 14SRCREV_machine_qemuarm ?= "978f148bf7dd253c901d4b16401309fc50eed0a9"
15SRCREV_machine_qemumips ?= "5233fddda6c698399eca44320027d5ee3ba662a8" 15SRCREV_machine_qemumips ?= "0d1b0e40b279433b1a96ed8ee02a10f6d2c7bea7"
16SRCREV_machine_qemuppc ?= "265e7bcceaa36d7cddbc20d73e451d376b66fb30" 16SRCREV_machine_qemuppc ?= "ae9aa3e76bcc720993b02830b1cae9b15ae9b6c6"
17SRCREV_machine_qemux86 ?= "25d0ebad3e2bf9f12bd6d386ead68e1f64ceaf29" 17SRCREV_machine_qemux86 ?= "e9cdab78bed262dbeadc7f403989f20972bcddde"
18SRCREV_machine_qemux86-64 ?= "25d0ebad3e2bf9f12bd6d386ead68e1f64ceaf29" 18SRCREV_machine_qemux86-64 ?= "e9cdab78bed262dbeadc7f403989f20972bcddde"
19SRCREV_machine_qemumips64 ?= "7a092b58f5f8f8f7893b2ee05d3d725ac2968d99" 19SRCREV_machine_qemumips64 ?= "38d9a2f8f334e1896629572f25968f34d8fb188d"
20SRCREV_machine ?= "25d0ebad3e2bf9f12bd6d386ead68e1f64ceaf29" 20SRCREV_machine ?= "e9cdab78bed262dbeadc7f403989f20972bcddde"
21SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 21SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
22 22
23SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 23SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"