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 E7F842EA16D; Tue, 22 Jul 2025 14:10:30 +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=1753193431; cv=none; b=Rb0KxAsjm/kux4U66HNHT3lmhqiqJVhl8sLGYSYatfLXbd+POpXjHzhR+d7ccYjE1/aGVmVoPqrsRTQnQ03FOeBahS3PMAV7Mk4E3I84I6IFJn1uc9x7ytnBdNE9ewo4CZRF+iHnwBvRhotTFZDv1tCiny4gfoZ7SX5PSIGaJAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753193431; c=relaxed/simple; bh=Rf23UG36Z9MF+6AkDxdwZpwFkXHE0YRDO/LBaM2y1+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dOFP4TwXmZ6pgqSTWll6z2Abib3Kingx7ST77RozvHU5km2RTPUgfjzVzOXWTY7V2KubggFG/qUaBSWBzRr8ke9iI2BIFe7Gxwwe5N/hh3izY57PsoEDcp9qiN1Ddj4vL3jOgncb1DUIb4Filp9que/9edcqnN0uI71f4Nu76uE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QqNN3wpA; 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="QqNN3wpA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64FE9C4CEEB; Tue, 22 Jul 2025 14:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1753193430; bh=Rf23UG36Z9MF+6AkDxdwZpwFkXHE0YRDO/LBaM2y1+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqNN3wpAHnd+GgGm2LiH131HoXDJNL5HMa9fd6+wP3vvDr27uQvfRvB1Eq/tKjM26 Tk3ajqvwmuuA78B+dPactR69IEW1DW3NSA5jB2T/tMg/J8jQdualB1UxkBJFi8cQy9 UpJB6SK3eOpYXypSQSQXddaxnvE83CK7hrGBQNEY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+c52293513298e0fd9a94@syzkaller.appspotmail.com, "Enju, Kohei" , Ian Abbott Subject: [PATCH 6.15 090/187] comedi: das16m1: Fix bit shift out of bounds Date: Tue, 22 Jul 2025 15:44:20 +0200 Message-ID: <20250722134349.081795523@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250722134345.761035548@linuxfoundation.org> References: <20250722134345.761035548@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 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Abbott commit ed93c6f68a3be06e4e0c331c6e751f462dee3932 upstream. When checking for a supported IRQ number, the following test is used: /* only irqs 2, 3, 4, 5, 6, 7, 10, 11, 12, 14, and 15 are valid */ if ((1 << it->options[1]) & 0xdcfc) { However, `it->options[i]` is an unchecked `int` value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring `it->options[1]` to be within bounds before proceeding with the original test. Reported-by: syzbot+c52293513298e0fd9a94@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=c52293513298e0fd9a94 Fixes: 729988507680 ("staging: comedi: das16m1: tidy up the irq support in das16m1_attach()") Tested-by: syzbot+c52293513298e0fd9a94@syzkaller.appspotmail.com Suggested-by: "Enju, Kohei" Cc: stable@vger.kernel.org # 5.13+ Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20250707130908.70758-1-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/comedi/drivers/das16m1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/comedi/drivers/das16m1.c +++ b/drivers/comedi/drivers/das16m1.c @@ -522,7 +522,8 @@ static int das16m1_attach(struct comedi_ devpriv->extra_iobase = dev->iobase + DAS16M1_8255_IOBASE; /* only irqs 2, 3, 4, 5, 6, 7, 10, 11, 12, 14, and 15 are valid */ - if ((1 << it->options[1]) & 0xdcfc) { + if (it->options[1] >= 2 && it->options[1] <= 15 && + (1 << it->options[1]) & 0xdcfc) { ret = request_irq(it->options[1], das16m1_interrupt, 0, dev->board_name, dev); if (ret == 0)