From 6c5c3a2edccfeedffdbd2634895778685f17bd2e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 30 May 2019 22:49:32 +0200 Subject: kernel: Update to version 4.4.182 Fixes: - CVE-2019-11479 - CVE-2019-11478 - CVE-2019-11477 - CVE-2019-11833 - CVE-2019-11091 - CVE-2018-12126 - CVE-2018-12130 - CVE-2018-12127 - CVE-2019-3882 - CVE-2019-6974 - CVE-2019-3819 - CVE-2019-7221 - CVE-2019-7222 - CVE-2019-3701 - CVE-2018-19985 - CVE-2018-1120 And probably more Signed-off-by: Hauke Mehrtens --- .../006-mfd-qcom_rpm-Handle-message-RAM-clock.patch | 2 +- .../096-08-usb-dwc3-remove-num_event_buffers.patch | 12 ++++++------ .../patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch | 4 ++-- target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch | 2 +- .../patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'target/linux/ipq806x') diff --git a/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch b/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch index 96b768d97c..2ca1c929d9 100644 --- a/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch +++ b/target/linux/ipq806x/patches-4.4/006-mfd-qcom_rpm-Handle-message-RAM-clock.patch @@ -76,7 +76,7 @@ Signed-off-by: Lee Jones irq_ack = platform_get_irq_byname(pdev, "ack"); if (irq_ack < 0) { dev_err(&pdev->dev, "required ack interrupt missing\n"); -@@ -621,7 +637,11 @@ static int qcom_rpm_probe(struct platfor +@@ -625,7 +641,11 @@ static int qcom_rpm_probe(struct platfor static int qcom_rpm_remove(struct platform_device *pdev) { diff --git a/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch b/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch index 5f989bdc06..1d81564d0d 100644 --- a/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch +++ b/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch @@ -161,7 +161,7 @@ Signed-off-by: Felipe Balbi --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -2571,14 +2571,14 @@ static void dwc3_process_event_entry(str +@@ -2572,14 +2572,14 @@ static void dwc3_process_event_entry(str } } @@ -178,7 +178,7 @@ Signed-off-by: Felipe Balbi left = evt->count; if (!(evt->flags & DWC3_EVENT_PENDING)) -@@ -2603,7 +2603,7 @@ static irqreturn_t dwc3_process_event_bu +@@ -2604,7 +2604,7 @@ static irqreturn_t dwc3_process_event_bu evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE; left -= 4; @@ -187,7 +187,7 @@ Signed-off-by: Felipe Balbi } evt->count = 0; -@@ -2611,9 +2611,9 @@ static irqreturn_t dwc3_process_event_bu +@@ -2612,9 +2612,9 @@ static irqreturn_t dwc3_process_event_bu ret = IRQ_HANDLED; /* Unmask interrupt */ @@ -199,7 +199,7 @@ Signed-off-by: Felipe Balbi return ret; } -@@ -2623,27 +2623,23 @@ static irqreturn_t dwc3_thread_interrupt +@@ -2624,27 +2624,23 @@ static irqreturn_t dwc3_thread_interrupt struct dwc3 *dwc = _dwc; unsigned long flags; irqreturn_t ret = IRQ_NONE; @@ -231,7 +231,7 @@ Signed-off-by: Felipe Balbi count &= DWC3_GEVNTCOUNT_MASK; if (!count) return IRQ_NONE; -@@ -2652,9 +2648,9 @@ static irqreturn_t dwc3_check_event_buf( +@@ -2653,9 +2649,9 @@ static irqreturn_t dwc3_check_event_buf( evt->flags |= DWC3_EVENT_PENDING; /* Mask interrupt */ @@ -243,7 +243,7 @@ Signed-off-by: Felipe Balbi return IRQ_WAKE_THREAD; } -@@ -2662,18 +2658,8 @@ static irqreturn_t dwc3_check_event_buf( +@@ -2663,18 +2659,8 @@ static irqreturn_t dwc3_check_event_buf( static irqreturn_t dwc3_interrupt(int irq, void *_dwc) { struct dwc3 *dwc = _dwc; diff --git a/target/linux/ipq806x/patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch b/target/linux/ipq806x/patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch index fef5c68a01..e8172a1220 100644 --- a/target/linux/ipq806x/patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch +++ b/target/linux/ipq806x/patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch @@ -76,7 +76,7 @@ Signed-off-by: Felipe Balbi struct usb_gadget gadget; --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -2578,7 +2578,7 @@ static irqreturn_t dwc3_process_event_bu +@@ -2579,7 +2579,7 @@ static irqreturn_t dwc3_process_event_bu int left; u32 reg; @@ -85,7 +85,7 @@ Signed-off-by: Felipe Balbi left = evt->count; if (!(evt->flags & DWC3_EVENT_PENDING)) -@@ -2637,7 +2637,7 @@ static irqreturn_t dwc3_check_event_buf( +@@ -2638,7 +2638,7 @@ static irqreturn_t dwc3_check_event_buf( u32 count; u32 reg; diff --git a/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch b/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch index 033b5bab1a..89c07dac2e 100644 --- a/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch +++ b/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch @@ -820,7 +820,7 @@ Signed-off-by: Mathieu Olivari #endif --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1186,6 +1186,11 @@ int dsa_slave_create(struct dsa_switch * +@@ -1190,6 +1190,11 @@ int dsa_slave_create(struct dsa_switch * p->xmit = brcm_netdev_ops.xmit; break; #endif diff --git a/target/linux/ipq806x/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch b/target/linux/ipq806x/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch index 29f09f2323..41a5cd890e 100644 --- a/target/linux/ipq806x/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch +++ b/target/linux/ipq806x/patches-4.4/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch @@ -180,6 +180,6 @@ Signed-off-by: Adrian Panella + } +#endif + + /* parameters may set static keys */ + jump_label_init(); parse_early_param(); - after_dashes = parse_args("Booting kernel", - static_command_line, __start___param, -- cgit v1.2.3