Unverified Commit 813c2f29 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: icp3-dtrace: Revert "Fix wrong kfree() usage" 

The offending patch introduces memory leak when there is no error, the
memory allocated for the temporary storage is not freed up.

As I have commented, the original code was correct and cleaner to
follow but it was not obvious from the patch that it will introduce
regression.

Fixes: 8c91ca76 ("ASoC: SOF: icp3-dtrace: Fix wrong kfree() usage")
Link: https://lore.kernel.org/all/aec61f67-6b4f-49e6-b458-c332983a0ad6@linux.intel.com/


Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://msgid.link/r/20240112132749.28970-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e3b3ec96

sound/soc/sof/ipc3-dtrace.c

+1 −2
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ 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;

		}

	}
@@ -209,13 +208,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;

}