From: "Michael S. Tsirkin" <mst@redhat.com>
To: Sasha Levin <levinsasha928@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Rusty Russell <rusty@rustcorp.com.au>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH 2/2] virtio-net: Prevent NULL dereference
Date: Mon, 26 Sep 2011 21:47:03 +0300 [thread overview]
Message-ID: <20110926184703.GB22278@redhat.com> (raw)
In-Reply-To: <1317058869-19276-2-git-send-email-levinsasha928@gmail.com>
On Mon, Sep 26, 2011 at 08:41:09PM +0300, Sasha Levin wrote:
> This patch prevents a NULL dereference when the user has passed a length
> longer than an actual buffer to virtio-net.
>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: virtualization@lists.linux-foundation.org
> Cc: netdev@vger.kernel.org
> Cc: kvm@vger.kernel.org
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Hmm, another protection against a buggy device, right?
No problem with that, but let's discard the packet
and print a disgnostic, so that the user can discover
what happened.
> ---
> drivers/net/virtio_net.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 64e0717..8d32c1e 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -198,7 +198,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
> len -= copy;
> offset += copy;
>
> - while (len) {
> + while (len && page) {
> set_skb_frag(skb, page, offset, &len);
> page = (struct page *)page->private;
> offset = 0;
> --
> 1.7.6.1
next prev parent reply other threads:[~2011-09-26 18:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-26 17:41 [PATCH 1/2] virtio-net: Verify page list size before fitting into skb Sasha Levin
2011-09-26 17:41 ` [PATCH 2/2] virtio-net: Prevent NULL dereference Sasha Levin
2011-09-26 18:47 ` Michael S. Tsirkin [this message]
2011-09-26 18:44 ` [PATCH 1/2] virtio-net: Verify page list size before fitting into skb Michael S. Tsirkin
2011-09-26 19:37 ` Sasha Levin
2011-09-26 19:45 ` Pekka Enberg
2011-09-26 19:57 ` Michael S. Tsirkin
2011-09-26 20:04 ` Pekka Enberg
2011-09-26 19:57 ` Sasha Levin
2011-09-26 19:55 ` Michael S. Tsirkin
2011-09-27 6:44 ` Sasha Levin
2011-09-27 7:00 ` Michael S. Tsirkin
2011-09-27 11:20 ` Sasha Levin
2011-09-27 12:37 ` Michael S. Tsirkin
2011-09-28 12:19 ` Sasha Levin
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=20110926184703.GB22278@redhat.com \
--to=mst@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=levinsasha928@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.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.