diff options
| author |   Aidan MacDonald <aidanmacdonald.0x0@gmail.com> | 2022-06-20 21:05:57 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-06-22 11:59:52 +0100 |
| commit | 3f05010f243be06478a9b11cfce0ce994f5a0890 (patch) | |
| tree | 191e259686b9b625eb7775b1a56dd803fa07f7bf | |
| parent | regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips (diff) | |
| download | linux-dev-3f05010f243be06478a9b11cfce0ce994f5a0890.tar.xz linux-dev-3f05010f243be06478a9b11cfce0ce994f5a0890.zip | |
regmap-irq: Fix offset/index mismatch in read_sub_irq_data()
We need to divide the sub-irq status register offset by register
stride to get an index for the status buffer to avoid an out of
bounds write when the register stride is greater than 1.
Fixes: a2d21848d921 ("regmap: regmap-irq: Add main status register support")
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20220620200644.1961936-3-aidanmacdonald.0x0@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 4f785bc7981c..a6db605707b0 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -387,6 +387,7 @@ static inline int read_sub_irq_data(struct regmap_irq_chip_data *data, subreg = &chip->sub_reg_offsets[b]; for (i = 0; i < subreg->num_regs; i++) { unsigned int offset = subreg->offset[i]; + unsigned int index = offset / map->reg_stride; if (chip->not_fixed_stride) ret = regmap_read(map, @@ -395,7 +396,7 @@ static inline int read_sub_irq_data(struct regmap_irq_chip_data *data, else ret = regmap_read(map, chip->status_base + offset, - &data->status_buf[offset]); + &data->status_buf[index]); if (ret) break; |