aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 13:42:02 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 16:44:13 +0200
commit6c1bef833d4be35e29446571cd3675814f329c52 (patch)
tree6e5c7d2949862b81cd8071e7d2d641fd7d673880 /target/linux/brcm2708
parent467adaf6c5c3dd73be74397b0d3d9bee56a72d83 (diff)
downloadupstream-6c1bef833d4be35e29446571cd3675814f329c52.tar.gz
upstream-6c1bef833d4be35e29446571cd3675814f329c52.tar.bz2
upstream-6c1bef833d4be35e29446571cd3675814f329c52.zip
kernel: bump 4.9 to 4.9.183
Refreshed all patches. Remove upstreamed: - 010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.9/010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch45
-rw-r--r--target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch2
2 files changed, 1 insertions, 46 deletions
diff --git a/target/linux/brcm2708/patches-4.9/010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch b/target/linux/brcm2708/patches-4.9/010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch
deleted file mode 100644
index 15ec7d3d3f..0000000000
--- a/target/linux/brcm2708/patches-4.9/010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9a0c16060094eab93f6d928e72f7e8c1cd67a9f8 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Wed, 19 Jun 2019 19:15:29 +0200
-Subject: Revert "staging: vc04_services: prevent integer overflow in create_pagelist()"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-This reverts commit cf07331c8827c9e9e0b4274c9b60204c18592241 which was
-commit ca641bae6da977d638458e78cd1487b6160a2718 upstream.
-
-Martin writes:
- This commit breaks the kernel build because the vchiq_pagelist_info
- struct is not defined in v4.9.182.
-
- It was only added in v4.10, in commit
- 4807f2c0e684e907c501cb96049809d7a957dbc2.
-
-Reported-by: Martin Weinelt <martin@linuxlounge.net>
-Cc: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-@@ -381,18 +381,9 @@ create_pagelist(char __user *buf, size_t
- int run, addridx, actual_pages;
- unsigned long *need_release;
-
-- if (count >= INT_MAX - PAGE_SIZE)
-- return NULL;
--
- offset = (unsigned int)buf & (PAGE_SIZE - 1);
- num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE;
-
-- if (num_pages > (SIZE_MAX - sizeof(PAGELIST_T) -
-- sizeof(struct vchiq_pagelist_info)) /
-- (sizeof(u32) + sizeof(pages[0]) +
-- sizeof(struct scatterlist)))
-- return NULL;
--
- *ppagelist = NULL;
-
- /* Allocate enough storage to hold the page pointers and the page
diff --git a/target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch b/target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch
index 862f322e6d..621e40a39b 100644
--- a/target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch
@@ -39,7 +39,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
-@@ -4383,6 +4383,9 @@ static int _dwc2_hcd_suspend(struct usb_
+@@ -4387,6 +4387,9 @@ static int _dwc2_hcd_suspend(struct usb_
if (!HCD_HW_ACCESSIBLE(hcd))
goto unlock;