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 D82D623AB9D; Tue, 22 Jul 2025 14:00:51 +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=1753192851; cv=none; b=fGeSj0qPVFspt8n2pzyYanegpuPzcq8YnuzSkB//K8oufoUSfXWgLXcn28QtH8zRMw3wSsGc9IAjsjYcLJKYBq+4bC8HY/OuHMEWi6Cgm14IBAx4gxvRZf0TmtCdPjfG+8uvjlil/PDViODtRi7qLDDqbOFUSiEV+Kd6tm96aV0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753192851; c=relaxed/simple; bh=Dfz/wBlm6Q2SgTOSQa2tJm1c3s7qJ3xLRUwwpffl8xw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YRPUclCJASyyuBeB0DrbqPy5yaW/6coH2jo2U5L24hWAOTuEtZ5Vpp7d7KI0eWKeqvISY0BVeQvzVwqJ3bVebiuuj/0F7cxz/nkzh+1X9Vv0B8xEwa8Y1fPYi47gPFgzv6tBt6eYY3/NyrUepXVAEKiobaCARCxG5xuJ472RSDI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BV9LLcuF; 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="BV9LLcuF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 601BDC4CEEB; Tue, 22 Jul 2025 14:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1753192851; bh=Dfz/wBlm6Q2SgTOSQa2tJm1c3s7qJ3xLRUwwpffl8xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BV9LLcuFVyxg9xBc51MKdDdmMtIyeaW/LGMQ2I4bWkzYBj70TpK8UlTsi3x4STm0j GOYloA9GE4cBhP7WdplsdX+JeQ7F665SnBYssi8pWXy6jht6cR7uZRePl17w7FtP4u IYUoqbkzV52WSSC5yfnxPEt3c6V6kmyVJA++qPGA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Abbott Subject: [PATCH 6.12 077/158] comedi: das6402: Fix bit shift out of bounds Date: Tue, 22 Jul 2025 15:44:21 +0200 Message-ID: <20250722134343.651099018@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250722134340.596340262@linuxfoundation.org> References: <20250722134340.596340262@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Abbott commit 70f2b28b5243df557f51c054c20058ae207baaac upstream. When checking for a supported IRQ number, the following test is used: /* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */ if ((1 << it->options[1]) & 0x8cec) { 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. Valid `it->options[1]` values that select the IRQ will be in the range [1,15]. The value 0 explicitly disables the use of interrupts. Fixes: 79e5e6addbb1 ("staging: comedi: das6402: rewrite broken driver") Cc: stable@vger.kernel.org # 5.13+ Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20250707135737.77448-1-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/comedi/drivers/das6402.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/comedi/drivers/das6402.c +++ b/drivers/comedi/drivers/das6402.c @@ -567,7 +567,8 @@ static int das6402_attach(struct comedi_ das6402_reset(dev); /* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */ - if ((1 << it->options[1]) & 0x8cec) { + if (it->options[1] > 0 && it->options[1] < 16 && + (1 << it->options[1]) & 0x8cec) { ret = request_irq(it->options[1], das6402_interrupt, 0, dev->board_name, dev); if (ret == 0) {