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 <[email protected]>
---
 drivers/platform/x86/alienware-wmi.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/alienware-wmi.c 
b/drivers/platform/x86/alienware-wmi.c
index 3e17e99..541f951 100644
--- a/drivers/platform/x86/alienware-wmi.c
+++ b/drivers/platform/x86/alienware-wmi.c
@@ -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);
        }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" 
in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to