gpiolib: fix bitmap operations related to line event watching
PATCH 1/1 gpiolib: fix bitmap operations related to line event watching
From: Bartosz Golaszewski <[email protected]>
When operating on the bits of watched_lines bitmap, we're using desc_to_gpio() which returns the GPIO number from the global numberspace. This leads to all sorts of memory corruptions and invalid behavior. We should switch to using gpio_chip_hwgpio() instead.
--- drivers/gpio/gpiolib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib.c +3 -3
@@ -1261,7 +1261,7 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)return -EFAULT ;if (cmd ==GPIO_GET_LINEINFO_WATCH_IOCTL ) -set_bit (desc_to_gpio (desc), priv->watched_lines); +set_bit (gpio_chip_hwgpio (desc), priv->watched_lines);return 0 ; }else if (cmd ==GPIO_GET_LINEHANDLE_IOCTL ) {
@@ -1276,7 +1276,7 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)if (IS_ERR (desc))return PTR_ERR (desc); -clear_bit (desc_to_gpio (desc), priv->watched_lines); +clear_bit (gpio_chip_hwgpio (desc), priv->watched_lines);return 0 ; }return -EINVAL ;
@@ -1304,7 +1304,7 @@ static int lineinfo_changed_notify(struct notifier_block *nb,struct gpio_desc *desc = data;int ret; -if (!test_bit (desc_to_gpio (desc), priv->watched_lines)) +if (!test_bit (gpio_chip_hwgpio (desc), priv->watched_lines))return NOTIFY_DONE ;memset (&chg,0 ,sizeof (chg));
Signature · 1 line
2.25.0
Quoted 10 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
When operating on the bits of
watched_linesbitmap, we're usingdesc_to_gpio()which returns the GPIO number from the global numberspace. This leads to all sorts of memory corruptions and invalid behavior. We should switch to usinggpio_chip_hwgpio()instead.Fixes 51c1064e82e7 ("gpiolib: add new ioctl() for monitoring changes in line info")Reported-by Kent Gibson <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
That fixes all the failures I was seeing.
Quoted 38 lines
--- drivers/gpio/gpiolib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpio/gpiolib.c +3
-3@@ -1261,7 +1261,7 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)return -EFAULT ;if (cmd ==GPIO_GET_LINEINFO_WATCH_IOCTL ) -set_bit (desc_to_gpio (desc), priv->watched_lines); +set_bit (gpio_chip_hwgpio (desc), priv->watched_lines);return 0 ; }else if (cmd ==GPIO_GET_LINEHANDLE_IOCTL ) {@@ -1276,7 +1276,7 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)if (IS_ERR (desc))return PTR_ERR (desc); -clear_bit (desc_to_gpio (desc), priv->watched_lines); +clear_bit (gpio_chip_hwgpio (desc), priv->watched_lines);return 0 ; }return -EINVAL ;@@ -1304,7 +1304,7 @@ static int lineinfo_changed_notify(struct notifier_block *nb,struct gpio_desc *desc = data;int ret; -if (!test_bit (desc_to_gpio (desc), priv->watched_lines)) +if (!test_bit (gpio_chip_hwgpio (desc), priv->watched_lines))return NOTIFY_DONE ;memset (&chg,0 ,sizeof (chg));Signature · 1 line
2.25.0
Quoted 10 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
When operating on the bits of
watched_linesbitmap, we're usingdesc_to_gpio()which returns the GPIO number from the global numberspace. This leads to all sorts of memory corruptions and invalid behavior. We should switch to usinggpio_chip_hwgpio()instead.Fixes 51c1064e82e7 ("gpiolib: add new ioctl() for monitoring changes in line info")Reported-by Kent Gibson <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
This looks good but where should it be applied? It fails to apply to my devel branch where this lives.
Yours,
Linus Walleij
sob., 29 lut 2020 o 00:20 Linus Walleij <[email protected]> napisał(a):
Quoted 14 lines · Bartosz Golaszewski
Quoted 11 lines
From: Bartosz Golaszewski <[email protected]>
When operating on the bits of
watched_linesbitmap, we're usingdesc_to_gpio()which returns the GPIO number from the global numberspace. This leads to all sorts of memory corruptions and invalid behavior. We should switch to usinggpio_chip_hwgpio()instead.Fixes 51c1064e82e7 ("gpiolib: add new ioctl() for monitoring changes in line info")Reported-by Kent Gibson <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
Quoted 5 lines
This looks good but where should it be applied? It fails to apply to my devel branch where this lives.
Yours,
Linus Walleij
This depends on Kent's other patch. I'll send you a PR.
Bart