From 9aca5b1f7a6aaad2ca4a7dbebfeef04ecd6ffbe2 Mon Sep 17 00:00:00 2001 From: Karthikeyan Mani Date: Wed, 1 May 2019 10:47:43 -0700 Subject: [PATCH] asoc: codecs: bolero: Add checks before accessing allocated pointer Add null checks to regmap allocation and kalloc failure cases. Change-Id: I81c35672e43db671b4626fb47d706919b6a3e7f6 Signed-off-by: Karthikeyan Mani --- asoc/codecs/bolero/bolero-clk-rsc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/asoc/codecs/bolero/bolero-clk-rsc.c b/asoc/codecs/bolero/bolero-clk-rsc.c index 03befde80a27..0e6faf012282 100644 --- a/asoc/codecs/bolero/bolero-clk-rsc.c +++ b/asoc/codecs/bolero/bolero-clk-rsc.c @@ -326,6 +326,10 @@ void bolero_clk_rsc_fs_gen_request(struct device *dev, bool enable) return; } regmap = dev_get_regmap(priv->dev->parent, NULL); + if (!regmap) { + pr_err("%s: regmap is null\n", __func__); + return; + } if (enable) { if (priv->reg_seq_en_cnt++ == 0) { for (i = 0; i < (priv->num_fs_reg * 2); i += 2) { @@ -495,6 +499,10 @@ static int bolero_clk_rsc_probe(struct platform_device *pdev) } clk_name_array = devm_kzalloc(&pdev->dev, clk_cnt * sizeof(char *), GFP_KERNEL); + if (!clk_name_array) { + ret = -ENOMEM; + goto err; + } ret = of_property_read_string_array(pdev->dev.of_node, "clock-names", clk_name_array, clk_cnt);