From: Eric Dumazet <eric.dumazet@gmail.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: netdev <netdev@vger.kernel.org>
Subject: Re: [BUG] acess_ok() missing from zerocopy_sg_from_iovec()
Date: Mon, 03 Jun 2013 18:06:09 -0700 [thread overview]
Message-ID: <1370307969.24311.196.camel@edumazet-glaptop> (raw)
In-Reply-To: <1370306052.24311.193.camel@edumazet-glaptop>
On Mon, 2013-06-03 at 17:34 -0700, Eric Dumazet wrote:
> It looks like access_ok(VERIFY_READ, base, len) checks are missing in
> drivers/net/tun.c & drivers/net/macvtap.c before the
> get_user_pages_fast() calls.
>
> Or am I missing something ?
>
Patch would be :
[PATCH] tun/macvtap: use access_ok(VERIFY_READ)
Zero copy is good if only we make all needed security checks.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 59e9605..d793b7d 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -522,6 +522,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
if (i + size > MAX_SKB_FRAGS)
return -EMSGSIZE;
+ if (!access_ok(VERIFY_READ, base, len))
+ return -EFAULT;
num_pages = get_user_pages_fast(base, size, 0, &page[i]);
if (num_pages != size) {
for (i = 0; i < num_pages; i++)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 89776c5..7a7b3b1 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1008,6 +1008,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
if (i + size > MAX_SKB_FRAGS)
return -EMSGSIZE;
+ if (!access_ok(VERIFY_READ, base, len))
+ return -EFAULT;
num_pages = get_user_pages_fast(base, size, 0, &page[i]);
if (num_pages != size) {
for (i = 0; i < num_pages; i++)
next prev parent reply other threads:[~2013-06-04 1:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 0:34 [BUG] acess_ok() missing from zerocopy_sg_from_iovec() Eric Dumazet
2013-06-04 1:06 ` Eric Dumazet [this message]
2013-06-04 3:25 ` Jason Wang
2013-06-04 5:32 ` Michael S. Tsirkin
2013-06-04 5:30 ` Michael S. Tsirkin
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=1370307969.24311.196.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=mst@redhat.com \
--cc=netdev@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