ASoC: SOF: icp3-dtrace: Fix wrong kfree() usage
authorKamil Duljas <kamil.duljas@gmail.com>
Thu, 16 Nov 2023 22:01:03 +0000 (23:01 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 28 Nov 2023 14:19:12 +0000 (14:19 +0000)
trace_filter_parse() allocs memory for *out and when
-ENOMEM is returned, caller function, dfsentry_trace_filter_write()
trying to freed this memory.

After this patch, the memory is freed in trace_filter_parse()
before -EINVAL returned. In caller function removed kfree(elms)
from error label

Signed-off-by: Kamil Duljas <kamil.duljas@gmail.com>
Link: https://lore.kernel.org/r/20231116220102.2097-2-kamil.duljas@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/ipc3-dtrace.c

index 0dca139322f3d22a14c7f6d45a9a343090a9f2bb..93b189c2d2ee2f8886e8c1cbbc52100ea2c2be72 100644 (file)
@@ -137,6 +137,7 @@ static int trace_filter_parse(struct snd_sof_dev *sdev, char *string,
                        dev_err(sdev->dev,
                                "Parsing filter entry '%s' failed with %d\n",
                                entry, entry_len);
+                       kfree(*out);
                        return -EINVAL;
                }
        }
@@ -208,13 +209,13 @@ static ssize_t dfsentry_trace_filter_write(struct file *file, const char __user
                ret = ipc3_trace_update_filter(sdev, num_elems, elems);
                if (ret < 0) {
                        dev_err(sdev->dev, "Filter update failed: %d\n", ret);
+                       kfree(elems);
                        goto error;
                }
        }
        ret = count;
 error:
        kfree(string);
-       kfree(elems);
        return ret;
 }