From: Gabriel Knezek <gabeknez@linux.microsoft.com>
To: linux-gpio@vger.kernel.org
Cc: Gabriel Knezek <gabeknez@microsoft.com>
Subject: [PATCH] gpiolib: cdev: zero padding during conversion to gpioline_info_changed
Date: Fri, 18 Jun 2021 15:45:11 -0700 [thread overview]
Message-ID: <1624056311-6836-1-git-send-email-gabeknez@linux.microsoft.com> (raw)
From: Gabriel Knezek <gabeknez@microsoft.com>
When userspace requests a GPIO v1 line info changed event, the kernel
populates and returns the gpioline_info_changed structure. That structure
contains 5 words of padding at the end of the structure that are not
initialized before being returned to usermode:
struct gpioline_info_changed {
struct gpioline_info info;
__u64 timestamp;
__u32 event_type;
__u32 padding[5]; /* for future use */
};
Which is used here in the lineinfo_watch_read routine:
} else {
struct gpioline_info_changed event_v1;
gpio_v2_line_info_changed_to_v1(&event, &event_v1);
if (copy_to_user(buf + bytes_read, &event_v1,
event_size))
return -EFAULT;
Fix this by zeroing the structure in gpio_v2_line_info_change_to_v1
before populating its contents.
Signed-off-by: Gabriel Knezek <gabeknez@microsoft.com>
---
drivers/gpio/gpiolib-cdev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index ee5903aac497..af68532835fe 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -1865,6 +1865,7 @@ static void gpio_v2_line_info_changed_to_v1(
struct gpio_v2_line_info_changed *lic_v2,
struct gpioline_info_changed *lic_v1)
{
+ memset(lic_v1, 0, sizeof(*lic_v1));
gpio_v2_line_info_to_v1(&lic_v2->info, &lic_v1->info);
lic_v1->timestamp = lic_v2->timestamp_ns;
lic_v1->event_type = lic_v2->event_type;
--
2.25.1
next reply other threads:[~2021-06-18 22:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 22:45 Gabriel Knezek [this message]
2021-06-19 4:11 ` [PATCH] gpiolib: cdev: zero padding during conversion to gpioline_info_changed Kent Gibson
2021-06-19 17:49 ` Gabriel Knezek
2021-06-19 20:08 ` Andy Shevchenko
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=1624056311-6836-1-git-send-email-gabeknez@linux.microsoft.com \
--to=gabeknez@linux.microsoft.com \
--cc=gabeknez@microsoft.com \
--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).