From: "Michael S. Tsirkin" <mst@redhat.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>,
netdev@vger.kernel.org, xma@us.ibm.com, davem@davemloft.net,
linux-kernel@vger.kernel.org, ebiederm@xmission.com
Subject: Re: [PATCH 3/6] macvtap: zerocopy: validate vector length before pinning user pages
Date: Tue, 17 Apr 2012 09:19:19 +0300 [thread overview]
Message-ID: <20120417061918.GA20905@redhat.com> (raw)
In-Reply-To: <1334559183.28012.45.camel@edumazet-glaptop>
On Mon, Apr 16, 2012 at 08:53:03AM +0200, Eric Dumazet wrote:
> On Mon, 2012-04-16 at 14:08 +0800, Jason Wang wrote:
> > Currently we do not validate the vector length before calling
> > get_user_pages_fast(), host stack would be easily overflowed by
> > malicious guest driver who give us a descriptor with length greater
> > than MAX_SKB_FRAGS. Solve this problem by checking the free entries
> > before trying to pin user pages.
> >
> > Signed-off-by: Jason Wang <jasowang@redhat.com>
> > ---
> > drivers/net/macvtap.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
> > index 7cb2684..d197a78 100644
> > --- a/drivers/net/macvtap.c
> > +++ b/drivers/net/macvtap.c
> > @@ -529,6 +529,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
> > }
> > base = (unsigned long)from->iov_base + offset;
> > size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
> > + if (i + size >= MAX_SKB_FRAGS)
> > + return -EFAULT;
> > num_pages = get_user_pages_fast(base, size, 0, &page[i]);
> > if ((num_pages != size) ||
> > (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
> >
>
> Hi Jason
>
> Why is -EFAULT the right error code ?
skb_copy_datagram_from_iovec return -EFAULT on iovs
that are too large, too, so this is at least consistent.
--
MST
next prev parent reply other threads:[~2012-04-17 7:14 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 6:07 [PATCH 1/6] macvtap: zerocopy: fix offset calculation when building skb Jason Wang
2012-04-16 6:07 ` [PATCH 2/6] macvtap: zerocopy: fix truesize underestimation Jason Wang
2012-04-16 7:14 ` Michael S. Tsirkin
2012-04-16 8:23 ` Jason Wang
2012-04-16 8:49 ` Eric Dumazet
2012-04-16 13:25 ` Michael S. Tsirkin
2012-04-16 6:08 ` [PATCH 3/6] macvtap: zerocopy: validate vector length before pinning user pages Jason Wang
2012-04-16 6:53 ` Eric Dumazet
2012-04-16 8:21 ` Jason Wang
2012-04-17 5:33 ` Eric Dumazet
2012-04-17 5:43 ` Michael S. Tsirkin
2012-04-17 6:19 ` Michael S. Tsirkin [this message]
2012-04-16 7:58 ` Michael S. Tsirkin
2012-04-16 6:08 ` [PATCH 4/6] macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built successfully Jason Wang
2012-04-16 6:08 ` [PATCH 5/6] vhost_net: fix use after free of vq->ubufs Jason Wang
2012-04-16 13:28 ` Michael S. Tsirkin
2012-04-17 3:19 ` Jason Wang
2012-04-17 10:22 ` Michael S. Tsirkin
2012-04-17 10:47 ` Jason Wang
2012-04-16 6:08 ` [PATCH 6/6] vhost_net: don't poll on -EFAULT Jason Wang
2012-04-16 7:16 ` Michael S. Tsirkin
2012-04-16 8:28 ` Jason Wang
2012-04-16 13:39 ` Michael S. Tsirkin
2012-04-17 3:27 ` Jason Wang
2012-04-17 4:57 ` Michael S. Tsirkin
2012-04-17 5:54 ` Jason Wang
2012-04-17 6:07 ` Michael S. Tsirkin
2012-04-17 6:30 ` Jason Wang
2012-04-17 10:18 ` Michael S. Tsirkin
2012-04-17 10:46 ` Jason Wang
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=20120417061918.GA20905@redhat.com \
--to=mst@redhat.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=xma@us.ibm.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).