gpiolib: fix the size of the ngpios variable
PATCH 1/1 gpiolib: fix the size of the ngpios variable
The ngpio fields both in struct gpio_device as well as gpio_chip are 16 bit unsigned integers. Let's not risk an overflow and use the correct size when reading the device property.
--- drivers/gpio/gpiolib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib.c +2 -2
@@ -607,7 +607,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base = gc->base;unsigned int i;int ret =0 ; -u32 ngpios; +u16 ngpios;if (gc->fwnode) fwnode = gc->fwnode;
@@ -665,7 +665,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,* of GPIO lines. */ if (gc->ngpio ==0 ) { - ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); + ret =device_property_read_u16 (&gdev->dev,"ngpios" , &ngpios);if (ret == -ENODATA )/* * -ENODATA means that there is no property found and
Signature · 1 line
2.30.1
Quoted 4 lines · Bartosz Golaszewski
The ngpio fields both in struct
gpio_deviceas well asgpio_chipare 16 bit unsigned integers. Let's not risk an overflow and use the correct size when reading the device property.
...
drivers/gpio/gpiolib.c int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, · line 668
Quoted 2 lines
drivers/gpio/gpiolib.c +1
-1- ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); + ret =device_property_read_u16 (&gdev->dev,"ngpios" , &ngpios);
AFAIU DT format you may not do this. The property is ABI-like and it's 32-bit (BE!). Reading as u16 will bring you 2 MSB (bytes) out of 4 from the 32-bit value.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 7 lines · Andy Shevchenko
Quoted 4 lines · Bartosz Golaszewski
The ngpio fields both in struct
gpio_deviceas well asgpio_chipare 16 bit unsigned integers. Let's not risk an overflow and use the correct size when reading the device property.
Quoted 9 lines
...
drivers/gpio/gpiolib.c int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, · line 668
Quoted 2 lines
drivers/gpio/gpiolib.c +1
-1- ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); + ret =device_property_read_u16 (&gdev->dev,"ngpios" , &ngpios);AFAIU DT format you may not do this. The property is ABI-like and it's 32-bit (BE!). Reading as u16 will bring you 2 MSB (bytes) out of 4 from the 32-bit value.
Ah right. It's not very obvious from the docs but the DT syntax must be different for 16 bits. In that case our best shot is to read a 32-bit unsigned integer and check if its value doesn't exceed UINT16_MAX.
Bart