From: Sasha Levin Date: Sat, 21 Oct 2023 20:45:37 +0000 (-0400) Subject: Fixes for 5.15 X-Git-Tag: v4.14.328~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=caf6bb280661776a59074b7b3ecd8e3642137d63;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/asoc-pxa-fix-a-memory-leak-in-probe.patch b/queue-5.15/asoc-pxa-fix-a-memory-leak-in-probe.patch new file mode 100644 index 00000000000..68cc313c2b6 --- /dev/null +++ b/queue-5.15/asoc-pxa-fix-a-memory-leak-in-probe.patch @@ -0,0 +1,36 @@ +From 0725fb717c57fb87c023aefbbdeb547b73718c83 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 Oct 2023 17:00:24 +0300 +Subject: ASoC: pxa: fix a memory leak in probe() + +From: Dan Carpenter + +[ Upstream commit aa6464edbd51af4a2f8db43df866a7642b244b5f ] + +Free the "priv" pointer before returning the error code. + +Fixes: 90eb6b59d311 ("ASoC: pxa-ssp: add support for an external clock in devicetree") +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/84ac2313-1420-471a-b2cb-3269a2e12a7c@moroto.mountain +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/pxa/pxa-ssp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c +index 7f13a35e9cc14..d6a2af293f458 100644 +--- a/sound/soc/pxa/pxa-ssp.c ++++ b/sound/soc/pxa/pxa-ssp.c +@@ -779,7 +779,7 @@ static int pxa_ssp_probe(struct snd_soc_dai *dai) + if (IS_ERR(priv->extclk)) { + ret = PTR_ERR(priv->extclk); + if (ret == -EPROBE_DEFER) +- return ret; ++ goto err_priv; + + priv->extclk = NULL; + } +-- +2.42.0 + diff --git a/queue-5.15/series b/queue-5.15/series index c18fcac8c08..d69a2bc6a68 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -132,3 +132,4 @@ platform-surface-platform_profile-propagate-error-if-profile-registration-fails. platform-x86-asus-wmi-change-asus_wmi_brn_down-code-from-0x20-to-0x2e.patch platform-x86-asus-wmi-map-0x2a-code-ignore-0x2b-and-0x2c-events.patch gpio-vf610-set-value-before-the-direction-to-avoid-a-glitch.patch +asoc-pxa-fix-a-memory-leak-in-probe.patch