]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz cleanup for xhci patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2019 15:52:48 +0000 (16:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2019 15:52:48 +0000 (16:52 +0100)
queue-4.14/xhci-Fix-memory-leak-in-xhci_add_in_port.patch
queue-4.4/xhci-Fix-memory-leak-in-xhci_add_in_port.patch

index 28e25c201e1cf62be2208d8048b434bb61915b2b..3388e38431836fc1cb9689aff3e7b23dfe848c48 100644 (file)
@@ -66,14 +66,12 @@ Link: https://lore.kernel.org/r/20191211142007.8847-2-mathias.nyman@linux.intel.
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/usb/host/xhci-mem.c | 4 ++++
+ drivers/usb/host/xhci-mem.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 7199e400fbace..19818367ff5c3 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -1940,10 +1940,14 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
+@@ -1866,10 +1866,14 @@ no_bw:
        kfree(xhci->port_array);
        kfree(xhci->rh_bw);
        kfree(xhci->ext_caps);
@@ -88,6 +86,3 @@ index 7199e400fbace..19818367ff5c3 100644
        xhci->rh_bw = NULL;
        xhci->ext_caps = NULL;
  
--- 
-2.20.1
-
index 28e25c201e1cf62be2208d8048b434bb61915b2b..a45b70db2cfca312b8444f952c4c0c0f8fe6ea92 100644 (file)
@@ -66,14 +66,12 @@ Link: https://lore.kernel.org/r/20191211142007.8847-2-mathias.nyman@linux.intel.
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/usb/host/xhci-mem.c | 4 ++++
+ drivers/usb/host/xhci-mem.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 7199e400fbace..19818367ff5c3 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -1940,10 +1940,14 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
+@@ -1928,10 +1928,14 @@ no_bw:
        kfree(xhci->port_array);
        kfree(xhci->rh_bw);
        kfree(xhci->ext_caps);
@@ -88,6 +86,3 @@ index 7199e400fbace..19818367ff5c3 100644
        xhci->rh_bw = NULL;
        xhci->ext_caps = NULL;
  
--- 
-2.20.1
-