From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH] gpio: cdev: fix a crash on line-request release
Date: Tue, 23 May 2023 17:51:01 +0200 [thread overview]
Message-ID: <20230523155101.196853-1-brgl@bgdev.pl> (raw)
When a GPIO device is forcefully unregistered, we are left with an
inactive object. If user-space kept an open file descriptor to a line
request associated with such a structure, upon closing it, we'll see the
kernel crash due to freeing unexistent GPIO descriptors.
Fix it by checking if chip is still alive before calling gpiod_free() in
release callbacks for both v2 and v1 ABI.
Fixes: 3c0d9c635ae2 ("gpiolib: cdev: support GPIO_V2_GET_LINE_IOCTL and GPIO_V2_LINE_GET_VALUES_IOCTL")
Reported-by: Kent Gibson <warthog618@gmail.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpiolib-cdev.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index 0a33971c964c..6830f668a1b0 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -315,13 +315,19 @@ static long linehandle_ioctl_compat(struct file *file, unsigned int cmd,
static void linehandle_free(struct linehandle_state *lh)
{
+ struct gpio_device *gdev = lh->gdev;
int i;
- for (i = 0; i < lh->num_descs; i++)
- if (lh->descs[i])
- gpiod_free(lh->descs[i]);
+ for (i = 0; i < lh->num_descs; i++) {
+ if (lh->descs[i]) {
+ down_write(&gdev->sem);
+ if (gdev->chip)
+ gpiod_free(lh->descs[i]);
+ up_write(&gdev->sem);
+ }
+ }
kfree(lh->label);
- gpio_device_put(lh->gdev);
+ gpio_device_put(gdev);
kfree(lh);
}
@@ -1565,17 +1571,21 @@ static ssize_t linereq_read(struct file *file, char __user *buf,
static void linereq_free(struct linereq *lr)
{
+ struct gpio_device *gdev = lr->gdev;
unsigned int i;
for (i = 0; i < lr->num_lines; i++) {
if (lr->lines[i].desc) {
edge_detector_stop(&lr->lines[i]);
- gpiod_free(lr->lines[i].desc);
+ down_write(&gdev->sem);
+ if (gdev->chip)
+ gpiod_free(lr->lines[i].desc);
+ up_write(&gdev->sem);
}
}
kfifo_free(&lr->events);
kfree(lr->label);
- gpio_device_put(lr->gdev);
+ gpio_device_put(gdev);
kfree(lr);
}
--
2.39.2
next reply other threads:[~2023-05-23 15:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 15:51 Bartosz Golaszewski [this message]
2023-05-23 23:58 ` [PATCH] gpio: cdev: fix a crash on line-request release Kent Gibson
2023-05-24 2:09 ` Kent Gibson
2023-05-24 4:36 ` Kent Gibson
2023-05-24 19:42 ` Bartosz Golaszewski
2023-05-25 2:47 ` Kent Gibson
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=20230523155101.196853-1-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viresh.kumar@linaro.org \
--cc=warthog618@gmail.com \
/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).