From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7809B3F65F2; Tue, 17 Mar 2026 17:07:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773767276; cv=none; b=ITWL+Svg+nL+uCyt8O+Fm0FMIDQhpxJRCZJW/21DmFEd2o1UCfNZxWs2FXD7RvrwwmEJlGG2dExP7s8tmTWwDTllmauKx59H5n6xe935TWy2Fpui9VuhyMNIg+MTdpurkQWqO9m8MWxHpGKws40aJ3HX2PDHOil/Iy6MpMvm4RI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773767276; c=relaxed/simple; bh=YODosPvtFiK2EB7DYBYU/0SN0yxH5wZA9InfrCHWINI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hmFkRqK5Q/2FmxJ74EUjivlD3Afc9wvBzpSxjWDajJfUklZF7Clf6EcKggEDJHJwIbL7ws8lk4+yZUITDnkVmgOTaQ3ILzWSHjKUNbV4dtZspE+dnCBDLcXKElmumf5ve+RtMcQosDbh/VjOzkGLMdSeErGhBiDBKix4poYpnm0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zhxC9y1/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zhxC9y1/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 837B2C4CEF7; Tue, 17 Mar 2026 17:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773767276; bh=YODosPvtFiK2EB7DYBYU/0SN0yxH5wZA9InfrCHWINI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zhxC9y1/T3hmAB7EwU76VDNjT2GNRisvA4KxeptUFPOk/2t4UGYp9nH9uBPhVcR1v Ia2+8gpE0HKAuIM0UNtB9EemM0rPQMhRm7yJZBLC/ytHaeOElkEwaCglS1XPrSAarZ L+WMnMkPtsT1mJtuteTujv2MgJpQ89hQl/940BtE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matteo Cotifava , Mark Brown , Sasha Levin Subject: [PATCH 6.18 052/333] ASoC: soc-core: drop delayed_work_pending() check before flush Date: Tue, 17 Mar 2026 17:31:21 +0100 Message-ID: <20260317163001.296757893@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317162959.345812316@linuxfoundation.org> References: <20260317162959.345812316@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: matteo.cotifava [ Upstream commit 3c99c9f0ed60582c1c9852b685d78d5d3a50de63 ] The delayed_work_pending() check before flush_delayed_work() in soc_free_pcm_runtime() is unnecessary and racy. flush_delayed_work() is safe to call unconditionally - it is a no-op when no work is pending. Remove the check. The original check was added by commit 9c9b65203492 ("ASoC: core: only flush inited work during free") but delayed_work_pending() followed by flush_delayed_work() has a time-of-check/time-of-use window where work can become pending between the two calls. Fixes: 9c9b65203492 ("ASoC: core: only flush inited work during free") Signed-off-by: Matteo Cotifava Link: https://patch.msgid.link/20260309215412.545628-2-cotifavamatteo@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9dd84d73046be..3b98b3f6cd5fe 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -462,8 +462,7 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) list_del(&rtd->list); - if (delayed_work_pending(&rtd->delayed_work)) - flush_delayed_work(&rtd->delayed_work); + flush_delayed_work(&rtd->delayed_work); snd_soc_pcm_component_free(rtd); /* -- 2.51.0