From: Greg Kroah-Hartman Date: Thu, 12 Aug 2021 13:20:42 +0000 (+0200) Subject: fuzz X-Git-Tag: v4.4.281~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=854c30c2199c04b3c29d35e80a2c9bde8a8d0907;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz --- diff --git a/queue-4.14/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch b/queue-4.14/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch index 882111a3cb9..02d6b5f29b2 100644 --- a/queue-4.14/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch +++ b/queue-4.14/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch @@ -19,14 +19,12 @@ Signed-off-by: Letu Ren Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++--- + drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c -index a8bb061e1a8a..36c7d78ba780 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c -@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) +@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct "driver lock acquired\n"); return 1; } @@ -35,7 +33,7 @@ index a8bb061e1a8a..36c7d78ba780 100644 } while (++i < 10); netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n"); -@@ -3291,7 +3291,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) +@@ -3291,7 +3291,7 @@ static int ql_adapter_reset(struct ql3_a if ((value & ISP_CONTROL_SR) == 0) break; @@ -44,7 +42,7 @@ index a8bb061e1a8a..36c7d78ba780 100644 } while ((--max_wait_time)); /* -@@ -3327,7 +3327,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) +@@ -3327,7 +3327,7 @@ static int ql_adapter_reset(struct ql3_a ispControlStatus); if ((value & ISP_CONTROL_FSR) == 0) break; @@ -53,6 +51,3 @@ index a8bb061e1a8a..36c7d78ba780 100644 } while ((--max_wait_time)); } if (max_wait_time == 0) --- -2.30.2 - diff --git a/queue-4.19/usb-dwc3-gadget-use-list_replace_init-before-travers.patch b/queue-4.19/usb-dwc3-gadget-use-list_replace_init-before-travers.patch index 05d3106c336..0c037514bbc 100644 --- a/queue-4.19/usb-dwc3-gadget-use-list_replace_init-before-travers.patch +++ b/queue-4.19/usb-dwc3-gadget-use-list_replace_init-before-travers.patch @@ -61,14 +61,12 @@ Link: https://lore.kernel.org/r/1627543994-20327-1-git-send-email-wcheng@codeaur Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/usb/dwc3/gadget.c | 18 ++++++++++++++++-- + drivers/usb/dwc3/gadget.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) -diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index c93bed41d988..e6e3095303b1 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -1466,11 +1466,18 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep) +@@ -1466,11 +1466,18 @@ static void dwc3_gadget_ep_cleanup_cance { struct dwc3_request *req; struct dwc3_request *tmp; @@ -88,7 +86,7 @@ index c93bed41d988..e6e3095303b1 100644 } static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, -@@ -2443,8 +2450,12 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep, +@@ -2443,8 +2450,12 @@ static void dwc3_gadget_ep_cleanup_compl { struct dwc3_request *req; struct dwc3_request *tmp; @@ -102,7 +100,7 @@ index c93bed41d988..e6e3095303b1 100644 int ret; ret = dwc3_gadget_ep_cleanup_completed_request(dep, event, -@@ -2452,6 +2463,9 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep, +@@ -2452,6 +2463,9 @@ static void dwc3_gadget_ep_cleanup_compl if (ret) break; } @@ -112,6 +110,3 @@ index c93bed41d988..e6e3095303b1 100644 } static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep) --- -2.30.2 - diff --git a/queue-4.9/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch b/queue-4.9/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch index bb0fa6abc0a..2938ca107a8 100644 --- a/queue-4.9/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch +++ b/queue-4.9/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch @@ -19,14 +19,12 @@ Signed-off-by: Letu Ren Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++--- + drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c -index 192950a112c9..cb9d43c871c4 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c -@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) +@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct "driver lock acquired\n"); return 1; } @@ -35,7 +33,7 @@ index 192950a112c9..cb9d43c871c4 100644 } while (++i < 10); netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n"); -@@ -3287,7 +3287,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) +@@ -3287,7 +3287,7 @@ static int ql_adapter_reset(struct ql3_a if ((value & ISP_CONTROL_SR) == 0) break; @@ -44,7 +42,7 @@ index 192950a112c9..cb9d43c871c4 100644 } while ((--max_wait_time)); /* -@@ -3323,7 +3323,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) +@@ -3323,7 +3323,7 @@ static int ql_adapter_reset(struct ql3_a ispControlStatus); if ((value & ISP_CONTROL_FSR) == 0) break; @@ -53,6 +51,3 @@ index 192950a112c9..cb9d43c871c4 100644 } while ((--max_wait_time)); } if (max_wait_time == 0) --- -2.30.2 - diff --git a/queue-5.10/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch b/queue-5.10/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch index c9c458aaeb1..be16dc5e462 100644 --- a/queue-5.10/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch +++ b/queue-5.10/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch @@ -37,14 +37,12 @@ Acked-by: Florian Fainelli Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- - drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++--- + drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c -index ed10da5313e8..a5bf4c3f6dc7 100644 --- a/drivers/firmware/broadcom/tee_bnxt_fw.c +++ b/drivers/firmware/broadcom/tee_bnxt_fw.c -@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct device *dev) +@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct devi pvt_data.dev = dev; @@ -57,7 +55,7 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 err = PTR_ERR(fw_shm_pool); goto out_sess; } -@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct device *dev) +@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct dev return 0; } @@ -72,7 +70,7 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 static const struct tee_client_device_id tee_bnxt_fw_id_table[] = { {UUID_INIT(0x6272636D, 0x2019, 0x0716, 0x42, 0x43, 0x4D, 0x5F, 0x53, 0x43, 0x48, 0x49)}, -@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt_fw_driver = { +@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt .bus = &tee_bus_type, .probe = tee_bnxt_fw_probe, .remove = tee_bnxt_fw_remove, @@ -80,6 +78,3 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 }, }; --- -2.30.2 - diff --git a/queue-5.13/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch b/queue-5.13/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch index f0d02ac36c0..118c59b66cc 100644 --- a/queue-5.13/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch +++ b/queue-5.13/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch @@ -37,14 +37,12 @@ Acked-by: Florian Fainelli Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- - drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++--- + drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c -index ed10da5313e8..a5bf4c3f6dc7 100644 --- a/drivers/firmware/broadcom/tee_bnxt_fw.c +++ b/drivers/firmware/broadcom/tee_bnxt_fw.c -@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct device *dev) +@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct devi pvt_data.dev = dev; @@ -57,7 +55,7 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 err = PTR_ERR(fw_shm_pool); goto out_sess; } -@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct device *dev) +@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct dev return 0; } @@ -72,7 +70,7 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 static const struct tee_client_device_id tee_bnxt_fw_id_table[] = { {UUID_INIT(0x6272636D, 0x2019, 0x0716, 0x42, 0x43, 0x4D, 0x5F, 0x53, 0x43, 0x48, 0x49)}, -@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt_fw_driver = { +@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt .bus = &tee_bus_type, .probe = tee_bnxt_fw_probe, .remove = tee_bnxt_fw_remove, @@ -80,6 +78,3 @@ index ed10da5313e8..a5bf4c3f6dc7 100644 }, }; --- -2.30.2 -