This is a note to let you know that I've just added the patch titled
ASoC: codecs: wcd938x: fix missing clsh ctrl error handling
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-codecs-wcd938x-fix-missing-clsh-ctrl-error-handling.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ed0dd9205bf69593edb495cb4b086dbae96a3f05 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Wed, 5 Jul 2023 14:30:13 +0200
Subject: ASoC: codecs: wcd938x: fix missing clsh ctrl error handling
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit ed0dd9205bf69593edb495cb4b086dbae96a3f05 upstream.
Allocation of the clash control structure may fail so add the missing
error handling to avoid dereferencing an error pointer.
Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver")
Cc: stable@xxxxxxxxxxxxxxx # 5.14
Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230705123018.30903-4-johan+linaro@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/wcd938x.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -3090,6 +3090,10 @@ static int wcd938x_soc_codec_probe(struc
WCD938X_ID_MASK);
wcd938x->clsh_info = wcd_clsh_ctrl_alloc(component, WCD938X);
+ if (IS_ERR(wcd938x->clsh_info)) {
+ pm_runtime_put(dev);
+ return PTR_ERR(wcd938x->clsh_info);
+ }
wcd938x_io_init(wcd938x);
/* Set all interrupts as edge triggered */
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.1/asoc-codecs-wcd938x-fix-missing-mbhc-init-error-handling.patch
queue-6.1/asoc-codecs-wcd938x-fix-resource-leaks-on-component-remove.patch
queue-6.1/asoc-qdsp6-audioreach-fix-topology-probe-deferral.patch
queue-6.1/asoc-codecs-wcd938x-fix-missing-clsh-ctrl-error-handling.patch
queue-6.1/asoc-codecs-wcd938x-fix-soundwire-initialisation-race.patch
queue-6.1/asoc-codecs-wcd934x-fix-resource-leaks-on-component-remove.patch
queue-6.1/asoc-codecs-wcd938x-fix-codec-initialisation-race.patch
queue-6.1/asoc-codecs-wcd-mbhc-v2-fix-resource-leaks-on-component-remove.patch
