The patch titled
acpi: fix NULL bug for HID/UID string
has been added to the -mm tree. Its filename is
acpi-fix-null-bug-for-hid-uid-string.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: acpi: fix NULL bug for HID/UID string
From: Lin Ming <ming.m.lin@xxxxxxxxx>
acpi_device->pnp.hardware_id and unique_id are now allocated pointer.
If it's NULL, return "\0" for acpi_device_hid and acpi_device_uid.
Also, free hardware_id and unique_id when acpi_device is going to be
freed.
Cc: Valdis Kletnieks <Valdis.Kletnieks@xxxxxx>
Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/scan.c | 4 ++++
include/acpi/acpi_bus.h | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff -puN drivers/acpi/scan.c~acpi-fix-null-bug-for-hid-uid-string drivers/acpi/scan.c
--- a/drivers/acpi/scan.c~acpi-fix-null-bug-for-hid-uid-string
+++ a/drivers/acpi/scan.c
@@ -309,6 +309,8 @@ static void acpi_device_release(struct d
struct acpi_device *acpi_dev = to_acpi_device(dev);
kfree(acpi_dev->pnp.cid_list);
+ kfree(acpi_dev->pnp.hardware_id);
+ kfree(acpi_dev->pnp.unique_id);
kfree(acpi_dev);
}
@@ -1359,6 +1361,8 @@ end:
*child = device;
else {
kfree(device->pnp.cid_list);
+ kfree(device->pnp.hardware_id);
+ kfree(device->pnp.unique_id);
kfree(device);
}
diff -puN include/acpi/acpi_bus.h~acpi-fix-null-bug-for-hid-uid-string include/acpi/acpi_bus.h
--- a/include/acpi/acpi_bus.h~acpi-fix-null-bug-for-hid-uid-string
+++ a/include/acpi/acpi_bus.h
@@ -186,8 +186,8 @@ struct acpi_device_pnp {
#define acpi_device_bid(d) ((d)->pnp.bus_id)
#define acpi_device_adr(d) ((d)->pnp.bus_address)
-#define acpi_device_hid(d) ((d)->pnp.hardware_id)
-#define acpi_device_uid(d) ((d)->pnp.unique_id)
+#define acpi_device_hid(d) ((d)->pnp.hardware_id ? (d)->pnp.hardware_id : "\0")
+#define acpi_device_uid(d) ((d)->pnp.unique_id ? (d)->pnp.unique_id : "\0")
#define acpi_device_name(d) ((d)->pnp.device_name)
#define acpi_device_class(d) ((d)->pnp.device_class)
_
Patches currently in -mm which might be from ming.m.lin@xxxxxxxxx are
linux-next.patch
acpi-fix-null-bug-for-hid-uid-string.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
