summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorHaotian Zhang <vulab@iscas.ac.cn>2025-12-15 12:26:52 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-02 12:56:58 +0100
commit042e9e86d8e170bffd0f8aff7717cee55e33f797 (patch)
treebb3cf230972e3cb3e0708a8cf1fcf09a09fc65c2 /sound
parent2068cf6f827650071f32c411045efd76bd40d73b (diff)
downloadlinux-042e9e86d8e170bffd0f8aff7717cee55e33f797.tar.gz
linux-042e9e86d8e170bffd0f8aff7717cee55e33f797.tar.bz2
linux-042e9e86d8e170bffd0f8aff7717cee55e33f797.zip
ALSA: vxpocket: Fix resource leak in vxpocket_probe error path
[ Upstream commit 2a03b40deacbd293ac9aed0f9b11197dad54fe5f ] When vxpocket_config() fails, vxpocket_probe() returns the error code directly without freeing the sound card resources allocated by snd_card_new(), which leads to a memory leak. Add proper error handling to free the sound card and clear the allocation bit when vxpocket_config() fails. Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions") Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn> Link: https://patch.msgid.link/20251215042652.695-1-vulab@iscas.ac.cn Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pcmcia/vx/vxpocket.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 2e09f2a513a6..9a5c9aa8eec4 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -284,7 +284,13 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
vxp->p_dev = p_dev;
- return vxpocket_config(p_dev);
+ err = vxpocket_config(p_dev);
+ if (err < 0) {
+ card_alloc &= ~(1 << i);
+ snd_card_free(card);
+ return err;
+ }
+ return 0;
}
static void vxpocket_detach(struct pcmcia_device *link)