]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
hsi: correctly handle return value of kzalloc
authorInsu Yun <wuninsu@gmail.com>
Sat, 17 Oct 2015 19:25:07 +0000 (19:25 +0000)
committerSebastian Reichel <sre@kernel.org>
Mon, 19 Oct 2015 09:42:02 +0000 (11:42 +0200)
Since kzalloc can be failed in memory pressure,
its return value should be checked and handled.

Signed-off-by: Insu Yun <wuninsu@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/hsi/hsi.c

index 35d631e9190801f3f36d7c95a1d790bc02394ace..df380d55c58fc916c35c8a680aab2e28f86a1584 100644 (file)
@@ -85,12 +85,14 @@ struct hsi_client *hsi_new_client(struct hsi_port *port,
 
        cl = kzalloc(sizeof(*cl), GFP_KERNEL);
        if (!cl)
-               return NULL;
+               goto err;
 
        cl->tx_cfg = info->tx_cfg;
        if (cl->tx_cfg.channels) {
                size = cl->tx_cfg.num_channels * sizeof(*cl->tx_cfg.channels);
                cl->tx_cfg.channels = kzalloc(size , GFP_KERNEL);
+               if (!cl->tx_cfg.channels)
+                       goto err_tx;
                memcpy(cl->tx_cfg.channels, info->tx_cfg.channels, size);
        }
 
@@ -98,6 +100,8 @@ struct hsi_client *hsi_new_client(struct hsi_port *port,
        if (cl->rx_cfg.channels) {
                size = cl->rx_cfg.num_channels * sizeof(*cl->rx_cfg.channels);
                cl->rx_cfg.channels = kzalloc(size , GFP_KERNEL);
+               if (!cl->rx_cfg.channels)
+                       goto err_rx;
                memcpy(cl->rx_cfg.channels, info->rx_cfg.channels, size);
        }
 
@@ -114,6 +118,12 @@ struct hsi_client *hsi_new_client(struct hsi_port *port,
        }
 
        return cl;
+err_rx:
+       kfree(cl->tx_cfg.channels);
+err_tx:
+       kfree(cl);
+err:
+       return NULL;
 }
 EXPORT_SYMBOL_GPL(hsi_new_client);