diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-09 14:50:29 +0200 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2014-01-15 08:31:53 +0100 |
| commit | ad5d25fef8f9459a9f67ec5fbae94287fdea3247 (patch) | |
| tree | cde8521539c7cb408ffb7c0c7eb5a47c3ec1532b /drivers/pinctrl/pinctrl-single.c | |
| parent | pinctrl: single: fix pcs_disable with bits_per_mux (diff) | |
| download | linux-dev-ad5d25fef8f9459a9f67ec5fbae94287fdea3247.tar.xz linux-dev-ad5d25fef8f9459a9f67ec5fbae94287fdea3247.zip | |
pinctrl: single: fix infinite loop caused by bad mask
commit 4e7e8017a80e1 (pinctrl: pinctrl-single:
enhance to configure multiple pins of different modules) improved
support for pinctrl-single,bits option, but also caused a regression
in parsing badly configured mask data.
If the masks in DT data are not quite right,
pcs_parse_bits_in_pinctrl_entry() can end up in an infinite loop,
trashing memory at the same time.
Add a check to verify that each loop actually removes bits from the
'mask', so that the loop can eventually end.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-single.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 174f4c50cd77..de6459628b4f 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1318,6 +1318,14 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, mask_pos = ((pcs->fmask) << (bit_pos - 1)); val_pos = val & mask_pos; submask = mask & mask_pos; + + if ((mask & mask_pos) == 0) { + dev_err(pcs->dev, + "Invalid mask for %s at 0x%x\n", + np->name, offset); + break; + } + mask &= ~mask_pos; if (submask != mask_pos) { |