iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: fixup line flags for userspace ABI

Browse Source 
This fixes the wrongly indicated lines in the userspace
ABI: test for the right BITS, do not treat bit numbers as
bitmasks.

Reported-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2016-02-22 13:44:53 +01:00
parent 2307f3aab8
commit 9d8cc89c31
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/gpiolib.c
View File

@ -380,17 +380,19 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
* this GPIO so it can't use it. * this GPIO so it can't use it.
*/ */
lineinfo.flags = 0; lineinfo.flags = 0;
if (desc->flags & (FLAG_REQUESTED | FLAG_IS_HOGGED | if (test_bit(FLAG_REQUESTED, &desc->flags) ||
FLAG_USED_AS_IRQ | FLAG_EXPORT | test_bit(FLAG_IS_HOGGED, &desc->flags) ||
FLAG_SYSFS)) test_bit(FLAG_USED_AS_IRQ, &desc->flags) ||
test_bit(FLAG_EXPORT, &desc->flags) ||
test_bit(FLAG_SYSFS, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_KERNEL; lineinfo.flags |= GPIOLINE_FLAG_KERNEL;
if (desc->flags & FLAG_IS_OUT) if (test_bit(FLAG_IS_OUT, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_IS_OUT; lineinfo.flags |= GPIOLINE_FLAG_IS_OUT;
if (desc->flags & FLAG_ACTIVE_LOW) if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW; lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW;
if (desc->flags & FLAG_OPEN_DRAIN) if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN; lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN;
if (desc->flags & FLAG_OPEN_SOURCE) if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE; lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
if (copy_to_user(ip, &lineinfo, sizeof(lineinfo))) if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))