diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-04-18 16:27:29 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-29 10:10:03 -0400 |
commit | 90fe17f4df2f830601ffd422b11d1f7f9a9d0355 (patch) | |
tree | f5e04bd8ea19125ed5217e41a6fb2dc3b992b5b2 /drivers/misc | |
parent | a815ab8b5891f3d2515316655729272f68269e3b (diff) |
thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 6cb781262f94..31115c9cfb34 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -5826,7 +5826,7 @@ static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) | |||
5826 | 5826 | ||
5827 | tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION), | 5827 | tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION), |
5828 | GFP_KERNEL); | 5828 | GFP_KERNEL); |
5829 | if (strnicmp(tp->model_str, "ThinkPad", 8) != 0) { | 5829 | if (tp->model_str && strnicmp(tp->model_str, "ThinkPad", 8) != 0) { |
5830 | kfree(tp->model_str); | 5830 | kfree(tp->model_str); |
5831 | tp->model_str = NULL; | 5831 | tp->model_str = NULL; |
5832 | } | 5832 | } |