From: Gary King <gary.king@oculus.com>
To: jikos@kernel.org
Cc: benjamin.tissoires@redhat.com, linux-input@vger.kernel.org,
Gary King <gary.king@oculus.com>
Subject: [PATCH] hidraw: fix list->buffer race condition
Date: Tue, 4 Oct 2016 17:44:26 -0700 [thread overview]
Message-ID: <1475628266-4767-1-git-send-email-gary.king@oculus.com> (raw)
hidraw input events are stored for each file descriptor in a lockless
circular queue. no memory barriers were used when the queue was
updated, which caused intermittent kernel panics due to heap corruption
when used on multi-core ARM systems.
add memory barriers to ensure that value updates are observable before
the head and tail referents are updated.
Change-Id: Ifb50f5ebe13c55c83aa105c5cd5926ca16fd93e0
Signed-off-by: Gary King <gary.king@oculus.com>
Reviewed-on: http://prn-ocugerrit01.thefacebook.com:8080/88
Reviewed-by: Ahmed Amin <ahmed.amin@oculus.com>
---
drivers/hid/hidraw.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index f0e2757..dc3465f 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -53,6 +53,7 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
mutex_lock(&list->read_mutex);
while (ret == 0) {
+ smp_rmb();
if (list->head == list->tail) {
add_wait_queue(&list->hidraw->wait, &wait);
set_current_state(TASK_INTERRUPTIBLE);
@@ -98,7 +99,9 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
kfree(list->buffer[list->tail].value);
list->buffer[list->tail].value = NULL;
+ smp_wmb();
list->tail = (list->tail + 1) & (HIDRAW_BUFFER_SIZE - 1);
+ smp_wmb();
}
out:
mutex_unlock(&list->read_mutex);
@@ -487,7 +490,7 @@ int hidraw_report_event(struct hid_device *hid, u8 *data, int len)
spin_lock_irqsave(&dev->list_lock, flags);
list_for_each_entry(list, &dev->list, node) {
int new_head = (list->head + 1) & (HIDRAW_BUFFER_SIZE - 1);
-
+ smp_rmb();
if (new_head == list->tail)
continue;
@@ -496,7 +499,9 @@ int hidraw_report_event(struct hid_device *hid, u8 *data, int len)
break;
}
list->buffer[list->head].len = len;
+ smp_wmb();
list->head = new_head;
+ smp_wmb();
kill_fasync(&list->fasync, SIGIO, POLL_IN);
}
spin_unlock_irqrestore(&dev->list_lock, flags);
--
1.9.1
next reply other threads:[~2016-10-05 0:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 0:44 Gary King [this message]
2016-10-05 7:53 ` [PATCH] hidraw: fix list->buffer race condition Benjamin Tissoires
2016-10-07 8:43 ` Jiri Kosina
2016-10-07 8:43 ` Jiri Kosina
2016-10-07 17:30 ` Gary King
2016-10-10 8:36 ` Jiri Kosina
2016-10-11 3:12 ` Dmitry Torokhov
2016-10-14 1:29 ` Gary King
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=1475628266-4767-1-git-send-email-gary.king@oculus.com \
--to=gary.king@oculus.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@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