alienware-wmi: cover some scenarios where memory allocations would fail
authorMario Limonciello <mario_limonciello@dell.com>
Fri, 4 Apr 2014 19:40:20 +0000 (14:40 -0500)
committerMatthew Garrett <matthew.garrett@nebula.com>
Thu, 10 Apr 2014 16:11:56 +0000 (12:11 -0400)
Intel test builder caught a few instances that should test if kzalloc failed to
allocate memory as well as a scenario that platform_driver wasn't properly
initialized.

Signed-off-by: Mario Limonciello <mario_limonciello@dell.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
drivers/platform/x86/alienware-wmi.c

index 3e17e996021c72beb67b6680fb3f31d588a1c067..541f9514f76f85d831c3423f5120ddf762e1fb67 100644 (file)
@@ -368,12 +368,20 @@ static int alienware_zone_init(struct platform_device *dev)
        zone_dev_attrs =
            kzalloc(sizeof(struct device_attribute) * (quirks->num_zones + 1),
                    GFP_KERNEL);
+       if (!zone_dev_attrs)
+               return -ENOMEM;
+
        zone_attrs =
            kzalloc(sizeof(struct attribute *) * (quirks->num_zones + 2),
                    GFP_KERNEL);
+       if (!zone_attrs)
+               return -ENOMEM;
+
        zone_data =
            kzalloc(sizeof(struct platform_zone) * (quirks->num_zones),
                    GFP_KERNEL);
+       if (!zone_data)
+               return -ENOMEM;
 
        for (i = 0; i < quirks->num_zones; i++) {
                sprintf(buffer, "zone%02X", i);
@@ -546,9 +554,9 @@ module_init(alienware_wmi_init);
 
 static void __exit alienware_wmi_exit(void)
 {
-       alienware_zone_exit(platform_device);
-       remove_hdmi(platform_device);
        if (platform_device) {
+               alienware_zone_exit(platform_device);
+               remove_hdmi(platform_device);
                platform_device_unregister(platform_device);
                platform_driver_unregister(&platform_driver);
        }