github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regmap: irq: fix incorrect index calculation for read_sub_irq_data()

Browse Source 
While working on a PMIC driver that utilizes num_main_regs > 1, this
issue was noticed. Currently, no in-tree driver sets `num_main_regs >
1`, so this bug has not been triggered in practice.

Pass the global index calculated with `i` instead of the local bit
offset `b` to read_sub_irq_data().

Fix an off-by-one error in the index bounds check.

This patch has been compile-tested only.

Signed-off-by: Qinguang Xu <guang.cy2023@gmail.com>
Link: https://patch.msgid.link/20261020-debug-v1-1-44e0491ede30@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Qinguang Xu 2026-10-20 21:39:06 +08:00 committed by Mark Brown
parent 2dee91ee94
commit 1ea2927c1b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/base/regmap/regmap-irq.c
View File

@ -398,14 +398,14 @@ static int read_irq_data(struct regmap_irq_chip_data *data)
/* Read sub registers with active IRQs */
for (i = 0; i < chip->num_main_regs; i++) {
unsigned int b;
unsigned int b, index;
const unsigned long mreg = data->main_status_buf[i];
for_each_set_bit(b, &mreg, map->format.val_bytes * 8) {
if (i * map->format.val_bytes * 8 + b >
max_main_bits)
index = i * map->format.val_bytes * 8 + b;
if (index >= max_main_bits)
break;
ret = read_sub_irq_data(data, b);
ret = read_sub_irq_data(data, index);
if (ret != 0) {
dev_err(map->dev, "Failed to read IRQ status %d\n", ret);