]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz cleanup
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 May 2020 11:32:55 +0000 (13:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 May 2020 11:32:55 +0000 (13:32 +0200)
queue-4.4/platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch
queue-4.9/platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch

index e3333b488ba347549a865ff3c2a63dc75645e682..2a779d19b53001bd85272e7834838dd7fcc581b5 100644 (file)
@@ -21,12 +21,12 @@ Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/platform/x86/alienware-wmi.c |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ drivers/platform/x86/alienware-wmi.c |   1++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
 
 --- a/drivers/platform/x86/alienware-wmi.c
 +++ b/drivers/platform/x86/alienware-wmi.c
-@@ -449,23 +449,23 @@ static acpi_status alienware_hdmi_comman
+@@ -449,23 +449,22 @@ static acpi_status alienware_hdmi_comman
  
        input.length = (acpi_size) sizeof(*in_args);
        input.pointer = in_args;
@@ -53,9 +53,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -                      *out_data = (u32) obj->integer.value;
        }
 -      kfree(output.pointer);
--      return status;
-+      return status;
+       return status;
+-
  }
  
  static ssize_t show_hdmi_cable(struct device *dev,
index 543ac9642f2db7367700cc1d6b10bcc75e3f1cbc..c98273e40e450ebcfa57ac711078db22184d1352 100644 (file)
@@ -21,12 +21,12 @@ Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/platform/x86/alienware-wmi.c |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ drivers/platform/x86/alienware-wmi.c |   1++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
 
 --- a/drivers/platform/x86/alienware-wmi.c
 +++ b/drivers/platform/x86/alienware-wmi.c
-@@ -504,23 +504,23 @@ static acpi_status alienware_wmax_comman
+@@ -504,23 +504,22 @@ static acpi_status alienware_wmax_comman
  
        input.length = (acpi_size) sizeof(*in_args);
        input.pointer = in_args;
@@ -53,9 +53,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -                      *out_data = (u32) obj->integer.value;
        }
 -      kfree(output.pointer);
--      return status;
-+      return status;
+       return status;
+-
  }
  
  /*