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=1795045630; b=pu+jiFRL0eMtCHP6zmj0uOnpEDdgcns6IgmHP09Y/LUBLizmGED06yTyTGIJ8DqPuBjR k8ZYmuMNGAV4cuFaU11B3rdOCSyE10qiXMTMOtCBgWeLSA/Tktx0Y8Z5+QVyxJi2oIFpR jOewR+B7TQwmnvkL6oz9wDOGgeU1QGi6pbAA99+oq3ua1bmXxLxOZqZEhh6AQwNEauLje lJF+8gkJyPV2mLeTnW4mamZHG1fnS4YvPhxW+ceCbkN6VicqUcczDR+BWHH0G1Z2BTVA5 wl5shrV0dXdNXL5QAC5XoWwOXiC3hFDTefslU+F9SbCo4y6e1iiIcC0TlY40EpaoIog== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045630; 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=hWDtk7muw5Zkz+YJDZamsEJOwvVSFPaVov6piR/sde8=; b=iyxV5PRE38CaVR0MEdxoUZogHKc04+eINgAMWvyVswY5IMNlIWxQit1mR2xosDn+Obas Q3cIzOFV7M0RnT1WiTU3WJpNVI0K9iDsnwSJSYloUbbU0MrTYmng0AkG2oDmoi502HFKj hab1UYl/rFjecdQW3ceRnTU1EKDM2jwWaXwfUF+0oD+K8CoX/CI5ZocISCqfk/aiOsjpK LgadA2Zro/yHR52HOoxGx7IeDlSBKqFJftYU4u33ar8bNx7PWkcZuEbCZ6mt4CYL41D0m qptf75KuX/GS3RQ8fLiFZJ2f7JNKdQ8AvVDPxXg0T10Uso/nmby/FcWyXVXwb6lvM2g== 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=cvXjHJNn; 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 C249B606A31C; Wed, 18 Nov 2026 23:47:10 +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=cvXjHJNn Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BC9D1F000C4; Wed, 18 Nov 2026 23:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045630; bh=hWDtk7muw5Zkz+YJDZamsEJOwvVSFPaVov6piR/sde8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cvXjHJNnNHTQonWmfmd0IFbwvhpLDYYMlbvehwsXpG8PsjiK9qmfV1+kog7vonETq CgwrtTe8CAWspQMpG0lASaz88kPrqxgE5QFKrCoY5kHyPWhxro0GJA8vL1eKJ+MR6+ QnnMcmxDtHF3lmgnn2PBf5azDKl8VEatHgfck70k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+0f98b0c0bdeaab2dc2fd@syzkaller.appspotmail.com, Sanan Hasanov , Guenter Roeck , Sasha Levin Subject: [PATCH 6.1 0985/2857] hwmon: (corsair-cpro) Make wait_input_report_lock IRQ safe Date: Wed, 18 Nov 2026 15:33:39 +0100 Message-ID: <20261118150237.070806501@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sanan Hasanov [ Upstream commit e4fdc82f55cf0e3d5df5c88278da5baa76a109d1 ] ccp_raw_event() is the HID ->raw_event() callback and takes wait_input_report_lock with a plain spin_lock(). This callback can run in very different contexts depending on the transport: from process context (e.g. uhid, via a write() to /dev/uhid) with softirqs and interrupts enabled, and from URB completion, which is softirq context for HCDs using HCD_BH and hard interrupt context for HCDs that do not (e.g. OHCI, UHCI). Taking the lock from process context with softirqs enabled while the same lock is also taken from softirq context can deadlock if the softirq interrupts the lock holder on the same CPU. Lockdep reports: WARNING: inconsistent lock state inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. ... spin_lock include/linux/spinlock.h:347 [inline] ccp_raw_event+0x51/0x110 drivers/hwmon/corsair-cpro.c:161 __hid_input_report+0x41c/0x580 drivers/hid/hid-core.c:2175 hid_irq_in+0x492/0x710 drivers/hid/usbhid/hid-core.c:287 __usb_hcd_giveback_urb+0x378/0x540 drivers/usb/core/hcd.c:1657 dummy_timer+0xa91/0x4cc0 drivers/usb/gadget/udc/dummy_hcd.c:2023 For the same reason, the spin_lock_bh() in send_usb_cmd() is not sufficient when ccp_raw_event() is called from hard interrupt context. Use spin_lock_irqsave() in ccp_raw_event(), since it may be called with interrupts already disabled, and spin_lock_irq() in send_usb_cmd(), which always runs in process context. Fixes: d02abd57e794 ("hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock") Reported-by: syzbot+0f98b0c0bdeaab2dc2fd@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=0f98b0c0bdeaab2dc2fd Cc: stable@vger.kernel.org Signed-off-by: Sanan Hasanov Link: https://patch.msgid.link/20261008205310.30832-1-sanan.hasanou@gmail.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/corsair-cpro.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/corsair-cpro.c b/drivers/hwmon/corsair-cpro.c index 62f9372f2d355..e0cf92896bc66 100644 --- a/drivers/hwmon/corsair-cpro.c +++ b/drivers/hwmon/corsair-cpro.c @@ -128,9 +128,9 @@ static int send_usb_cmd(struct ccp_device *ccp, u8 command, u8 byte1, u8 byte2, * the raw event parsing and marked the ccp->wait_input_report * completion as done. */ - spin_lock_bh(&ccp->wait_input_report_lock); + spin_lock_irq(&ccp->wait_input_report_lock); reinit_completion(&ccp->wait_input_report); - spin_unlock_bh(&ccp->wait_input_report_lock); + spin_unlock_irq(&ccp->wait_input_report_lock); ret = hid_hw_output_report(ccp->hdev, ccp->cmd_buffer, OUT_BUFFER_SIZE); if (ret < 0) @@ -149,15 +149,16 @@ static int send_usb_cmd(struct ccp_device *ccp, u8 command, u8 byte1, u8 byte2, static int ccp_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { struct ccp_device *ccp = hid_get_drvdata(hdev); + unsigned long flags; /* only copy buffer when requested */ - spin_lock(&ccp->wait_input_report_lock); + spin_lock_irqsave(&ccp->wait_input_report_lock, flags); if (!completion_done(&ccp->wait_input_report)) { memcpy(ccp->buffer, data, min(IN_BUFFER_SIZE, size)); ccp->buffer_recv_size = size; complete_all(&ccp->wait_input_report); } - spin_unlock(&ccp->wait_input_report_lock); + spin_unlock_irqrestore(&ccp->wait_input_report_lock, flags); return 0; } -- 2.53.0