From: Dan Carpenter <dan.carpenter@oracle.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>,
linux-gpio@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] gpiolib: shifters used as flags in gpio_ioctl()
Date: Tue, 23 Feb 2016 12:44:50 +0300 [thread overview]
Message-ID: <20160223094450.GB4030@mwanda> (raw)
We weren't testing whether the bits were set correctly because we used
shifters as flags. It means that we give the user incorrect line
information in this new ioctl.
Fixes: 521a2ad6f862 ('gpio: add userspace ABI for GPIO line information')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index b816469..d609e03 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -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.
*/
lineinfo.flags = 0;
- if (desc->flags & (FLAG_REQUESTED | FLAG_IS_HOGGED |
- FLAG_USED_AS_IRQ | FLAG_EXPORT |
- FLAG_SYSFS))
+ if (desc->flags & ((1 << FLAG_REQUESTED) |
+ (1 << FLAG_IS_HOGGED) |
+ (1 << FLAG_USED_AS_IRQ) |
+ (1 << FLAG_EXPORT) |
+ (1 << FLAG_SYSFS)))
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;
- if (desc->flags & FLAG_ACTIVE_LOW)
+ if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
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;
- if (desc->flags & FLAG_OPEN_SOURCE)
+ if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))
next reply other threads:[~2016-02-23 9:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 9:44 Dan Carpenter [this message]
2016-02-23 12:58 ` [patch] gpiolib: shifters used as flags in gpio_ioctl() Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160223094450.GB4030@mwanda \
--to=dan.carpenter@oracle.com \
--cc=gnurou@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).