From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794062769; b=B3eTzLsdMJoxenf35xoVJPVP5atbv/ISs/slyGifjIamp0Jrz68XL1FO+nh+BLDBKAYy QxhLQEXjHhbHysJh32Z9AjeeOgj4Nh1fGNnDZjDaNv52WjASySywD00zi+CUt1+uX8MRc a6vS8Lby55ST/5ZE+0udmuWGGoBtzEOE4WyqdV4u3JAkMvFGizZn1lLLaIXhVCzp10maL UfJ55Pl7Rn01fYJHw1kSHevLZfgLcwvNYrMn+AjNeGBv2wXiY26OFQnN5Vk+c70EIMiWB Ta1Tak9MwmLLNP47jA9+X2hrjLRok48dWrfGGaEeynOUJawW8sRvgSnJ6UbYH+fZt+w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794062769; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=lLuyz47LVa3cjjXH4iqhIhPlKA3bEefqa9hRFGBvfHg=; b=xMgxao9gz56dlncQmHY0RujGD/QLhzaAxH9YSY/TC3EzV5kgNOxPvslaZchb7af2Wdwm 0EDMD1MKM4SlLitTWLagAuTc0JCfucsc7cSItWFzKCpc9uYruTmW20Vqn1Oxt7xkIGBj9 XGy/fMJ+Sq9zubcMK/hfK2m1Agqoo1BSvyQuLCz2VXHXZZ+ljWhfCqmk3TJu3rAUpOvLy +nR3YSsn+9B7Bwo+jUC4WTcPTZ7Lv9UJBiekKSeD7tqcwS0DuPXIySVNQKe6NVoEvAJ/s uX3JSZRwckxylcoliH6+oGhbfAjJPX8R3SbXbSRPbRioAcmJBdrZefV90RRajgvpBeQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=cbnoT52R; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C352606A326; Sat, 7 Nov 2026 14:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=cbnoT52R Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B06E1F0089F; Sat, 7 Nov 2026 14:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794062769; bh=lLuyz47LVa3cjjXH4iqhIhPlKA3bEefqa9hRFGBvfHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cbnoT52R83Or5AjUjIDAq0AmKtDRe8gEObKDWgbJrwUMW6La4Vx6ApUh0423W6YWQ 5ct9vvCnrQH7jDsWH3d5wovx8m/ni0Cwz6RGg3N8OCI5OWCd0A7jwaA3RlCWMA0ONE 1yxR8AcU+s8iB9O3pvEUC6ub6uH3qZ3h40BwXoWA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Wu , Hans Verkuil , Sasha Levin Subject: [PATCH 6.18 077/869] media: cx231xx-audio: drain wq_trigger before audio fini Date: Sat, 7 Nov 2026 08:45:59 -0500 Message-ID: <20261107134855.349195185@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fan Wu [ Upstream commit a691c54986412e1fa87f036d2577d5a78a75e658 ] audio_trigger() is deferred work (dev->wq_trigger) armed from snd_cx231xx_capture_trigger() on every PCM START/STOP; it dereferences dev->adev state and may free the URBs via cx231xx_isoc_audio_deinit(). cx231xx_audio_fini() tore down that state without draining wq_trigger, so work armed before or racing fini ran against freed state. Use disable_work_sync() in fini to drain the work and prevent further queueing. Initialize the work, lock and stream_started counter at the top of cx231xx_audio_init(), before any fallible allocation, and clear the partially-built audio state on its error path, so fini is safe even if a later step fails. This issue was found by an in-house static analysis tool. Fixes: 61b04cb24a12 ("[media] cx231xx-audio: fix some locking issues") Cc: stable@vger.kernel.org # v6.10+ Link: https://lore.kernel.org/r/8c7e1294-b906-4636-890c-b64d03b0e1d0@kernel.org Assisted-by: Codex:gpt-5.6 Signed-off-by: Fan Wu Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/usb/cx231xx/cx231xx-audio.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c index 9c71b32552df3..1179cb0334f4d 100644 --- a/drivers/media/usb/cx231xx/cx231xx-audio.c +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c @@ -576,12 +576,19 @@ static int cx231xx_audio_init(struct cx231xx *dev) dev_dbg(dev->dev, "probing for cx231xx non standard usbaudio\n"); + /* + * Extension init errors are ignored by the cx231xx core, so fini() + * must be safe even if initialization fails part way through. + */ + spin_lock_init(&adev->slock); + INIT_WORK(&dev->wq_trigger, audio_trigger); + atomic_set(&dev->stream_started, 0); + err = snd_card_new(dev->dev, index[devnr], "Cx231xx Audio", THIS_MODULE, 0, &card); if (err < 0) return err; - spin_lock_init(&adev->slock); err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); if (err < 0) goto err_free_card; @@ -596,8 +603,6 @@ static int cx231xx_audio_init(struct cx231xx *dev) strscpy(card->shortname, "Cx231xx Audio", sizeof(card->shortname)); strscpy(card->longname, "Conexant cx231xx Audio", sizeof(card->longname)); - INIT_WORK(&dev->wq_trigger, audio_trigger); - err = snd_card_register(card); if (err < 0) goto err_free_card; @@ -651,8 +656,10 @@ static int cx231xx_audio_init(struct cx231xx *dev) err_free_pkt_size: kfree(adev->alt_max_pkt_size); + adev->alt_max_pkt_size = NULL; err_free_card: snd_card_free(card); + adev->sndcard = NULL; return err; } @@ -669,6 +676,8 @@ static int cx231xx_audio_fini(struct cx231xx *dev) return 0; } + disable_work_sync(&dev->wq_trigger); + if (dev->adev.sndcard) { snd_card_free_when_closed(dev->adev.sndcard); kfree(dev->adev.alt_max_pkt_size); -- 2.53.0