Merge tag 'platform-drivers-x86-v4.19-2' of git://git.infradead.org/linux-platform-drivers-x86

gregkh · gregkh · commit eba2d6b34a32 · 2018-09-19T07:21:21.000+02:00
Darren writes:
  "platform-drivers-x86 for v4.19-2

   Free allocated ACPI buffers in two drivers.

   The following is an automated git shortlog grouped by driver:

   alienware-wmi:
    -  Correct a memory leak

   dell-smbios-wmi:
    -  Correct a memory leak"

* tag 'platform-drivers-x86-v4.19-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: alienware-wmi: Correct a memory leak
  platform/x86: dell-smbios-wmi: Correct a memory leak
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
@@ -536,6 +536,7 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args,
 		if (obj && obj->type == ACPI_TYPE_INTEGER)
 			*out_data = (u32) obj->integer.value;
 	}
+	kfree(output.pointer);
 	return status;
 
 }
diff --git a/drivers/platform/x86/dell-smbios-wmi.c b/drivers/platform/x86/dell-smbios-wmi.c
@@ -78,6 +78,7 @@ static int run_smbios_call(struct wmi_device *wdev)
 	dev_dbg(&wdev->dev, "result: [%08x,%08x,%08x,%08x]\n",
 		priv->buf->std.output[0], priv->buf->std.output[1],
 		priv->buf->std.output[2], priv->buf->std.output[3]);
+	kfree(output.pointer);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,7 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args,`
`536`	`536`	`if (obj && obj->type == ACPI_TYPE_INTEGER)`
`537`	`537`	`*out_data = (u32) obj->integer.value;`
`538`	`538`	`}`
	`539`	`+ kfree(output.pointer);`
`539`	`540`	`return status;`
`540`	`541`
`541`	`542`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ static int run_smbios_call(struct wmi_device *wdev)`
`78`	`78`	`dev_dbg(&wdev->dev, "result: [%08x,%08x,%08x,%08x]\n",`
`79`	`79`	`priv->buf->std.output[0], priv->buf->std.output[1],`
`80`	`80`	`priv->buf->std.output[2], priv->buf->std.output[3]);`
	`81`	`+ kfree(output.pointer);`
`81`	`82`
`82`	`83`	`return 0;`
`83`	`84`	`}`