static code analysis issue fix - misc.c, codec.c and regmap.cSAMSUMG_A72_4.19

3 files changed, 31 insertions, 8 deletions

diff --git a/tas256x_driver/misc/tas256x-misc.c b/tas256x_driver/misc/tas256x-misc.c
index dad5d0d..7ab0123 100644
--- a/tas256x_driver/misc/tas256x-misc.c
+++ b/tas256x_driver/misc/tas256x-misc.c
@@ -72,11 +72,15 @@ static ssize_t tas256x_file_read(struct file *file,
         int ret = 0;
         unsigned char *p_kbuf = NULL;
         unsigned int reg = 0;
-        unsigned int len = 0;
+        size_t len = 0;
         unsigned int channel = channel_left;
 
         mutex_lock(&p_tas256x->file_lock);
 
+        /* count should be atleast 6*/
+        if (count < 6)
+                goto err;
+
         p_kbuf = kzalloc(count, GFP_KERNEL);
         if (p_kbuf == NULL)
                 goto err;
@@ -87,7 +91,7 @@ static ssize_t tas256x_file_read(struct file *file,
                 goto err;
         }
 
-        if ((p_kbuf[1] >= 0) && ((p_kbuf[1] <= 1)))
+        if (p_kbuf[1] <= 1)
                 channel = p_kbuf[1]+1;
 
         switch (p_kbuf[0]) {
@@ -146,7 +150,7 @@ static ssize_t tas256x_file_write(struct file *file,
         int ret = 0;
         unsigned char *p_kbuf = NULL;
         unsigned int reg = 0;
-        unsigned int len = 0;
+        size_t len = 0;
         unsigned int channel = channel_left;
 
         mutex_lock(&p_tas256x->file_lock);
@@ -161,8 +165,9 @@ static ssize_t tas256x_file_write(struct file *file,
                 goto err;
         }
 
-        if ((p_kbuf[1] >= 0) && ((p_kbuf[1] <= 1)))
+        if (p_kbuf[1] <= 1)
                 channel = p_kbuf[1]+1;
+
         switch (p_kbuf[0]) {
         case TIAUDIO_CMD_REG_WITE:
                 if (count > 5) {
diff --git a/tas256x_driver/os_layer/src/tas256x-codec.c b/tas256x_driver/os_layer/src/tas256x-codec.c
index 7023975..2f7a538 100644
--- a/tas256x_driver/os_layer/src/tas256x-codec.c
+++ b/tas256x_driver/os_layer/src/tas256x-codec.c
@@ -404,6 +404,9 @@ static int tas256x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                 ret = -EINVAL;
         }
 
+        if (ret)
+                goto end;
+
         switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
         case SND_SOC_DAIFMT_NB_NF:
                 dev_info(plat_data->dev, "INV format: NBNF\n");
@@ -430,6 +433,9 @@ static int tas256x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                 ret = -EINVAL;
         }
 
+        if (ret)
+                goto end;
+
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case (SND_SOC_DAIFMT_I2S):
                 tdm_rx_start_slot = 1;
@@ -456,11 +462,14 @@ static int tas256x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                         "SND_SOC_DAIFMT_LEFT_J tdm_rx_start_slot = 0\n");
                 break;
         default:
-        dev_err(plat_data->dev, "DAI Format is not found, fmt=0x%x\n", fmt);
-        ret = -EINVAL;
+                dev_err(plat_data->dev, "DAI Format is not found, fmt=0x%x\n", fmt);
+                ret = -EINVAL;
                 break;
         }
 
+        if (ret)
+                goto end;
+
         ret = tas256x_rx_set_start_slot(p_tas256x,
                 tdm_rx_start_slot, channel_both);
         if (ret)
diff --git a/tas256x_driver/os_layer/src/tas256x-regmap.c b/tas256x_driver/os_layer/src/tas256x-regmap.c
index 61d63bd..e902147 100644
--- a/tas256x_driver/os_layer/src/tas256x-regmap.c
+++ b/tas256x_driver/os_layer/src/tas256x-regmap.c
@@ -1014,10 +1014,11 @@ static void irq_work_routine(struct work_struct *work)
         /*Logical Layer IRQ function, return is ignored*/
         tas256x_irq_work_func(p_tas256x);
 
+end:
 #if IS_ENABLED(CONFIG_TAS256X_CODEC)
         mutex_unlock(&p_tas256x->codec_lock);
 #endif
-end:
+
         return;
 }
 
@@ -1174,10 +1175,16 @@ static int tas256x_parse_dt(struct device *dev,
         p_tas256x->devs =
                 kmalloc(p_tas256x->mn_channels * sizeof(struct tas_device *),
                         GFP_KERNEL);
+        if (!p_tas256x->devs) {
+                rc = -1;
+                goto EXIT;
+        }
+
         for (i = 0; i < p_tas256x->mn_channels; i++) {
                 p_tas256x->devs[i] = kmalloc(sizeof(struct tas_device),
                                         GFP_KERNEL);
                 if (p_tas256x->devs[i] == NULL) {
+                        kfree(p_tas256x->devs);
                         rc = -1;
                         break;
                 }
@@ -1329,7 +1336,7 @@ static int tas256x_i2c_probe(struct i2c_client *p_client,
 
         plat_data = devm_kzalloc(&p_client->dev,
                                         sizeof(struct linux_platform), GFP_KERNEL);
-        if (p_tas256x == NULL) {
+        if (plat_data == NULL) {
                 n_result = -ENOMEM;
                 goto err;
         }
@@ -1513,8 +1520,10 @@ static int tas256x_i2c_remove(struct i2c_client *p_client)
         for (i = 0; i < p_tas256x->mn_channels; i++) {
                 if (gpio_is_valid(p_tas256x->devs[i]->mn_reset_gpio))
                         gpio_free(p_tas256x->devs[i]->mn_reset_gpio);
+
                 if (gpio_is_valid(p_tas256x->devs[i]->mn_irq_gpio))
                         gpio_free(p_tas256x->devs[i]->mn_irq_gpio);
+
                 kfree(p_tas256x->devs[i]);
         }