From: James A Shackleford <shack@linux.com>
To: gregkh@linuxfoundation.org, alan@linux.intel.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: James A Shackleford <shack@linux.com>
Subject: [PATCH] staging: goldfish: fix direct copy_to_user() from __iomem
Date: Sun, 22 Jun 2014 03:29:38 -0400 [thread overview]
Message-ID: <1403422178-20833-1-git-send-email-shack@linux.com> (raw)
This patch allocates a few pages and performs an ioread8_rep() from the bus
address, which are then copied to userspace. This fixes the sparse warning:
drivers/staging/goldfish/goldfish_audio.c:136:43: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/goldfish/goldfish_audio.c:136:43: expected void const *from
drivers/staging/goldfish/goldfish_audio.c:136:43: got char [noderef] <asn:2>*read_buffer
which was a result of performing a copy_to_user() directly from the bus address
to the userspace, which can be unsafe across some architectures.
Signed-off-by: James A Shackleford <shack@linux.com>
---
drivers/staging/goldfish/goldfish_audio.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index a166424..535ed20 100644
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -118,10 +118,17 @@ static ssize_t goldfish_audio_read(struct file *fp, char __user *buf,
struct goldfish_audio *data = fp->private_data;
int length;
int result = 0;
+ unsigned int order;
+ void *read_buffer;
if (!data->read_supported)
return -ENODEV;
+ order = get_order(READ_BUFFER_SIZE);
+ read_buffer = (void *)__get_free_pages(GFP_KERNEL, order);
+ if (!read_buffer)
+ return -ENOMEM;
+
while (count > 0) {
length = (count > READ_BUFFER_SIZE ? READ_BUFFER_SIZE : count);
AUDIO_WRITE(data, AUDIO_START_READ, length);
@@ -129,17 +136,21 @@ static ssize_t goldfish_audio_read(struct file *fp, char __user *buf,
wait_event_interruptible(data->wait,
(data->buffer_status & AUDIO_INT_READ_BUFFER_FULL));
- length = AUDIO_READ(data,
- AUDIO_READ_BUFFER_AVAILABLE);
+ length = AUDIO_READ(data, AUDIO_READ_BUFFER_AVAILABLE);
/* copy data to user space */
- if (copy_to_user(buf, data->read_buffer, length))
- return -EFAULT;
+ ioread8_rep(data->read_buffer, read_buffer, length);
+ if (copy_to_user(buf, read_buffer, length)) {
+ result = -EFAULT;
+ goto error;
+ }
result += length;
buf += length;
count -= length;
}
+error:
+ __free_pages(read_buffer, order);
return result;
}
--
1.7.9.5
next reply other threads:[~2014-06-22 7:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-22 7:29 James A Shackleford [this message]
2014-06-23 10:58 ` [PATCH] staging: goldfish: fix direct copy_to_user() from __iomem Alan Cox
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=1403422178-20833-1-git-send-email-shack@linux.com \
--to=shack@linux.com \
--cc=alan@linux.intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.