Fix CVE-2017-1000364 by backporting the patches for rpi3

[AGL/meta-agl.git] / meta-agl-bsp / meta-raspberrypi / recipes-kernel / linux / linux-raspberrypi_%.bbappend

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index 1db6d42..6557ce0 100644 (file)
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -4,6 +4,14 @@ SRC_URI_append = "\
        ${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
 "
 
+# Fix CVE-2017-1000364
+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 \
+"
+
+
 do_configure_append_smack() {
     # SMACK and Co
     kernel_configure_variable IP_NF_SECURITY m
@@ -31,6 +39,39 @@ do_configure_append_sota() {
     kernel_configure_variable BLK_DEV_RAM y
 }
 
+# can
+do_configure_append() {
+
+    kernel_configure_variable TASKSTATS y
+    kernel_configure_variable TASK_DELAY_ACCT y
+    kernel_configure_variable USER_RETURN_NOTIFIER y
+    kernel_configure_variable PREEMPT_NOTIFIERS y
+    kernel_configure_variable CAN m
+    kernel_configure_variable CAN_RAW m
+    kernel_configure_variable CAN_BCM m
+    kernel_configure_variable CAN_GW m
+    kernel_configure_variable CAN_VCAN m
+    kernel_configure_variable CAN_SLCAN m
+    kernel_configure_variable CAN_DEV m
+    kernel_configure_variable CAN_CALC_BITTIMING y
+    kernel_configure_variable CAN_MCP251X m
+    kernel_configure_variable CAN_ESD_USB2 m
+    kernel_configure_variable CAN_GS_USB m
+    kernel_configure_variable CAN_KVASER_USB m
+    kernel_configure_variable CAN_PEAK_USB m
+    kernel_configure_variable CAN_8DEV_USB m
+
+# not enabled, yet ?
+# kernel_configure_variable CAN_LEDS is not set
+# kernel_configure_variable CAN_SJA1000 is not set
+# kernel_configure_variable CAN_C_CAN is not set
+# kernel_configure_variable CAN_M_CAN is not set
+# kernel_configure_variable CAN_CC770 is not set
+# kernel_configure_variable CAN_EMS_USB is not set
+# kernel_configure_variable CAN_SOFTING is not set
+# kernel_configure_variable CAN_DEBUG_DEVICES is not set
+}
+
 do_configure_append() {
 
     # VC4 Wayland/Weston
@@ -41,14 +82,14 @@ do_configure_append() {
     kernel_configure_variable FB_BCM2708 n
 
     # Enable support for TP-Link TL-W722N USB Wifi adapter
-    kernel_configure_variable CONFIG_ATH_CARDS m
-    kernel_configure_variable CONFIG_ATH9K_HTC m
+    kernel_configure_variable ATH_CARDS m
+    kernel_configure_variable ATH9K_HTC m
 
     # Enable support for RTLSDR
-    kernel_configure_variable CONFIG_MEDIA_USB_SUPPORT y
-    kernel_configure_variable CONFIG_MEDIA_DIGITAL_TV_SUPPORT y
-    kernel_configure_variable CONFIG_DVB_USB_V2 m
-    kernel_configure_variable CONFIG_DVB_USB_RTL28XXU m
+    kernel_configure_variable MEDIA_USB_SUPPORT y
+    kernel_configure_variable MEDIA_DIGITAL_TV_SUPPORT y
+    kernel_configure_variable DVB_USB_V2 m
+    kernel_configure_variable DVB_USB_RTL28XXU m
 
     # KEEP until fixed upstream:
       # Keep this the last line