]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Aug 2021 13:20:42 +0000 (15:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Aug 2021 13:20:42 +0000 (15:20 +0200)
queue-4.14/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch
queue-4.19/usb-dwc3-gadget-use-list_replace_init-before-travers.patch
queue-4.9/net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch
queue-5.10/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch
queue-5.13/firmware-tee_bnxt-release-tee-shm-session-and-contex.patch

index 882111a3cb9537aec2d132b5a5a8f275996f979b..02d6b5f29b2b0f6c74eb3aa259b32266a880f4fa 100644 (file)
@@ -19,14 +19,12 @@ Signed-off-by: Letu Ren <fantasquex@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index 05d3106c336e9349cfd32e4dbed26f44a9142585..0c037514bbcac63220a41d856dbc2c1ed33ebfd5 100644 (file)
@@ -61,14 +61,12 @@ Link: https://lore.kernel.org/r/1627543994-20327-1-git-send-email-wcheng@codeaur
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index bb0fa6abc0a6548481c61ddfea81a0b5c92fa85c..2938ca107a8d4f4c2ba1a5687f6551f98b1030db 100644 (file)
@@ -19,14 +19,12 @@ Signed-off-by: Letu Ren <fantasquex@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index c9c458aaeb1370579ff2d8007199d6e552c1c389..be16dc5e462a9a5337bc3fb2cca9272868dc53b8 100644 (file)
@@ -37,14 +37,12 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index f0d02ac36c05e80642752b39214b4f2ecbe3887d..118c59b66ccf311f14d1879eabe5045f85d143c0 100644 (file)
@@ -37,14 +37,12 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-