aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-07-21 09:30:57 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-07-21 19:30:25 +0000
commit2acf164e2e748d8591e5caac981b66e1db5aaf99 (patch)
tree34b13de966e26738690a269f41cfa3b06e753658
parent29f14a132187fb28fba353d482af0cb6e523b377 (diff)
Only apply CVE-2017-1000364 to 4.8 kernel - 4.4 needs different patchset
The patches are kernel version specific. Only apply to Kernel 4.8. Bug-AGL: SPEC-766 Change-Id: I8cd1cd980cc389bef30f2a4e80944e2b94f53da6 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10293 ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> (cherry picked from commit fa90294b523d32bede7e840b018e8ec0fc20c9c6) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10309
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend3
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend4
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
index 8205a3feb..fcd028062 100644
--- a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -18,6 +18,3 @@ SRC_URI += " file://rtl_sdr.cfg \
# disk drivers for vmdk
SRC_URI_append_qemux86 = " file://vbox-vmware-sata.cfg "
SRC_URI_append_qemux86-64 = " file://vbox-vmware-sata.cfg "
-
-# Backported fix for CVE-2017-1000364
-SRC_URI_append = " file://4.8-0001-SEC-Backport-Fix-CVE-2017-1000364-through-backport.patch "
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend
new file mode 100644
index 000000000..39b651faa
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto_4.8.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+# Backported fix for CVE-2017-1000364
+SRC_URI_append = " file://4.8-0001-SEC-Backport-Fix-CVE-2017-1000364-through-backport.patch "