From 8072264b96785184b76aa46bcd08b4f9cdfada42 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 22 Aug 2016 19:05:45 +0200 Subject: kernel: update kernel 4.4 to version 4.4.19 Refresh patches for all targets that support kernel 4.4. Compile-tested on all targets that use kernel 4.4 and aren't marked broken. Runtime-tested on ar71xx, octeon and x86/64. Signed-off-by: Stijn Tintel --- ...le-CONFIG_MEMCG-but-leave-it-disabled-due.patch | 4 +- ...Add-pwr_led-and-the-required-input-trigge.patch | 2 +- .../0111-mm-Remove-the-PFN-busy-warning.patch | 2 +- ...4l2-Verify-planes-array-in-buffer-dequeue.patch | 53 ---------------------- 4 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 target/linux/brcm2708/patches-4.4/0317-videobuf2-v4l2-Verify-planes-array-in-buffer-dequeue.patch (limited to 'target/linux/brcm2708/patches-4.4') diff --git a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch index 9f36433d98..6418cc0af3 100644 --- a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch @@ -10,7 +10,7 @@ Subject: [PATCH 061/423] config: Enable CONFIG_MEMCG, but leave it disabled --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5306,7 +5306,7 @@ int __init cgroup_init_early(void) +@@ -5307,7 +5307,7 @@ int __init cgroup_init_early(void) return 0; } @@ -19,7 +19,7 @@ Subject: [PATCH 061/423] config: Enable CONFIG_MEMCG, but leave it disabled /** * cgroup_init - cgroup initialization -@@ -5802,6 +5802,27 @@ static int __init cgroup_disable(char *s +@@ -5803,6 +5803,27 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch b/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch index 586b726155..44b2866877 100644 --- a/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch +++ b/target/linux/brcm2708/patches-4.4/0073-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch @@ -80,7 +80,7 @@ See: https://github.com/raspberrypi/linux/issues/1064 else --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig -@@ -126,4 +126,11 @@ config LEDS_TRIGGER_USBDEV +@@ -122,4 +122,11 @@ config LEDS_TRIGGER_USBDEV This allows LEDs to be controlled by the presence/activity of an USB device. If unsure, say N. diff --git a/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch b/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch index 2d7d12151e..59e61b7486 100644 --- a/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch +++ b/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -6780,8 +6780,6 @@ int alloc_contig_range(unsigned long sta +@@ -6782,8 +6782,6 @@ int alloc_contig_range(unsigned long sta /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { diff --git a/target/linux/brcm2708/patches-4.4/0317-videobuf2-v4l2-Verify-planes-array-in-buffer-dequeue.patch b/target/linux/brcm2708/patches-4.4/0317-videobuf2-v4l2-Verify-planes-array-in-buffer-dequeue.patch deleted file mode 100644 index 0672cdffe8..0000000000 --- a/target/linux/brcm2708/patches-4.4/0317-videobuf2-v4l2-Verify-planes-array-in-buffer-dequeue.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b9e91e565c8c05abec932a3d1bcb9bab81570ad6 Mon Sep 17 00:00:00 2001 -From: Sakari Ailus -Date: Sun, 3 Apr 2016 16:31:03 -0300 -Subject: [PATCH 317/423] videobuf2-v4l2: Verify planes array in buffer - dequeueing - -commit 2c1f6951a8a82e6de0d82b1158b5e493fc6c54ab upstream. - -When a buffer is being dequeued using VIDIOC_DQBUF IOCTL, the exact buffer -which will be dequeued is not known until the buffer has been removed from -the queue. The number of planes is specific to a buffer, not to the queue. - -This does lead to the situation where multi-plane buffers may be requested -and queued with n planes, but VIDIOC_DQBUF IOCTL may be passed an argument -struct with fewer planes. - -__fill_v4l2_buffer() however uses the number of planes from the dequeued -videobuf2 buffer, overwriting kernel memory (the m.planes array allocated -in video_usercopy() in v4l2-ioctl.c) if the user provided fewer -planes than the dequeued buffer had. Oops! - -Fixes: b0e0e1f83de3 ("[media] media: videobuf2: Prepare to divide videobuf2") - -Signed-off-by: Sakari Ailus -Acked-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Greg Kroah-Hartman ---- - drivers/media/v4l2-core/videobuf2-v4l2.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/media/v4l2-core/videobuf2-v4l2.c -+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c -@@ -67,6 +67,11 @@ static int __verify_planes_array(struct - return 0; - } - -+static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb) -+{ -+ return __verify_planes_array(vb, pb); -+} -+ - /** - * __verify_length() - Verify that the bytesused value for each plane fits in - * the plane length and that the data offset doesn't exceed the bytesused value. -@@ -432,6 +437,7 @@ static int __fill_vb2_buffer(struct vb2_ - } - - static const struct vb2_buf_ops v4l2_buf_ops = { -+ .verify_planes_array = __verify_planes_array_core, - .fill_user_buffer = __fill_v4l2_buffer, - .fill_vb2_buffer = __fill_vb2_buffer, - .set_timestamp = __set_timestamp, -- cgit v1.2.3