X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-qcom%2Frecipes-kernel%2Flinux%2Flinux-linaro-qcomlt_4.9.bbappend;h=80fe23b72527906c8198396069ffff10ff7fe5d9;hb=834b16ca1898968af62169bfe62b8cd6a5cbe8d7;hp=e6a60e5847783c9ee50b2db58dbd1b568aa295f8;hpb=50e118aea403430a88e250ec92bab98b3ca1b54c;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend
index e6a60e584..80fe23b72 100644
--- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend
+++ b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend
@@ -5,6 +5,13 @@ SRC_URI_append_smack = "\
        file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \
 "
 
+# Fix CVE-2017-1000364 by backporting the patches from upstream for 4.9
+SRC_URI_append = "\
+       file://0001-mm-larger-stack-guard-gap-between-vmas.patch \
+       file://0002-Allow-stack-to-grow-up-to-address-space-limit.patch \
+       file://0003-mm-fix-new-crash-in-unmapped_area_topdown.patch \
+"
+
 # Extra configuration options
 SRC_URI += "file://fanotify.cfg \
             file://uinput.cfg \
@@ -25,3 +32,6 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\
        ${WORKDIR}/smack.cfg \
        ${WORKDIR}/smack-default-lsm.cfg \
 "
+
+# file comes out of  meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg"