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 C621F215060; Tue, 29 Apr 2025 16:53:52 +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=1745945632; cv=none; b=sgBttxKGh49WtnmymhydawCUEE6G+vG9hr0Wq9ysyTWJlNVwyd8xZbA7fafKo5loDEzmY3PulwOuBQBh7jt0B3rxYFc7OeX2CkanKs1lKpwjUb2RuZYN+crBdDWHrBPqwvSJ9o7HIeHHh+xYSFowRk0mcoL4tSsFyJoX2nmmU/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745945632; c=relaxed/simple; bh=ioWXNWOT8vD38RBVra2xXsWvUT92sxFC58Y4URKYDow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H9nSy/lFUjWjwfw0xJR92D56eeNK4ikkwDolV0jb7L5kxOB5wSOpUqqqfiNpER+WF5ZBEX8PqWhC4Q/WIIeSYxYZZoSSh5gflOChRiaCwZbk6/mFDkVLD2uCDCI57hkDJ7k9uE5QkOHO+Mn/7fhuIxP/aJq1aBIf4APJDipF4vk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GGH5aoa/; 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="GGH5aoa/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32DCCC4CEE3; Tue, 29 Apr 2025 16:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745945632; bh=ioWXNWOT8vD38RBVra2xXsWvUT92sxFC58Y4URKYDow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GGH5aoa/rgI79ZEZfT5NDmXc/NhaGlSOLyST/FdTHUlm+1I+mW0OK6cL18QMeR0uH aLSBkPB8exFs4vwm1s0isaaLvq0NYUsVAS0hG5ZHjuSaUNvSocRqx0uJdizGPwhszl 4V1msasY/6hJnXLGcesYFRrBQdLVeG6xk8zgUDh4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Ian Abbott Subject: [PATCH 5.4 177/179] comedi: jr3_pci: Fix synchronous deletion of timer Date: Tue, 29 Apr 2025 18:41:58 +0200 Message-ID: <20250429161056.555397723@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161049.383278312@linuxfoundation.org> References: <20250429161049.383278312@linuxfoundation.org> User-Agent: quilt/0.68 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 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Abbott commit 44d9b3f584c59a606b521e7274e658d5b866c699 upstream. When `jr3_pci_detach()` is called during device removal, it calls `timer_delete_sync()` to stop the timer, but the timer expiry function always reschedules the timer, so the synchronization is ineffective. Call `timer_shutdown_sync()` instead. It does not matter that the timer expiry function pointer is cleared, because the device is being removed. Fixes: 07b509e6584a5 ("Staging: comedi: add jr3_pci driver") Cc: stable Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20250415123901.13483-1-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/jr3_pci.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -88,6 +88,7 @@ struct jr3_pci_poll_delay { struct jr3_pci_dev_private { struct timer_list timer; struct comedi_device *dev; + bool timer_enable; }; union jr3_pci_single_range { @@ -612,10 +613,11 @@ static void jr3_pci_poll_dev(struct time delay = sub_delay.max; } } + if (devpriv->timer_enable) { + devpriv->timer.expires = jiffies + msecs_to_jiffies(delay); + add_timer(&devpriv->timer); + } spin_unlock_irqrestore(&dev->spinlock, flags); - - devpriv->timer.expires = jiffies + msecs_to_jiffies(delay); - add_timer(&devpriv->timer); } static struct jr3_pci_subdev_private * @@ -764,6 +766,7 @@ static int jr3_pci_auto_attach(struct co devpriv->dev = dev; timer_setup(&devpriv->timer, jr3_pci_poll_dev, 0); devpriv->timer.expires = jiffies + msecs_to_jiffies(1000); + devpriv->timer_enable = true; add_timer(&devpriv->timer); return 0; @@ -773,8 +776,12 @@ static void jr3_pci_detach(struct comedi { struct jr3_pci_dev_private *devpriv = dev->private; - if (devpriv) + if (devpriv) { + spin_lock_bh(&dev->spinlock); + devpriv->timer_enable = false; + spin_unlock_bh(&dev->spinlock); del_timer_sync(&devpriv->timer); + } comedi_pci_detach(dev); }