From: Jan-Simon Möller Date: Fri, 21 Jul 2017 07:30:57 +0000 (+0200) Subject: Only apply CVE-2017-1000364 to 4.8 kernel - 4.4 needs different patchset X-Git-Tag: dab_3.99.3~2 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2acf164e2e748d8591e5caac981b66e1db5aaf99;p=AGL%2Fmeta-agl.git 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10293 ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account (cherry picked from commit fa90294b523d32bede7e840b018e8ec0fc20c9c6) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10309 --- 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 "