From: Jason Wang <jasowang@redhat•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: thuth@linux•vnet.ibm.com, rusty@au1•ibm.com,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
virtualization@lists•linux-foundation.org,
dahi@linux•vnet.ibm.com, pbonzini@redhat•com,
David Miller <davem@davemloft•net>
Subject: Re: [PATCH v6 25/46] virtio_net: stricter short buffer length checks
Date: Fri, 28 Nov 2014 08:39:19 +0008 [thread overview]
Message-ID: <1417163479.5822.5@smtp.corp.redhat.com> (raw)
In-Reply-To: <1417118789-18231-26-git-send-email-mst@redhat.com>
On Fri, Nov 28, 2014 at 4:09 AM, Michael S. Tsirkin <mst@redhat•com>
wrote:
> Our buffer length check is not strict enough for mergeable
> buffers: buffer can still be shorter that header + address
> by 2 bytes.
>
> Fix that up.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat•com>
> Reviewed-by: Cornelia Huck <cornelia.huck@de•ibm.com>
> ---
> drivers/net/virtio_net.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 516f2cb..098f443 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -437,7 +437,7 @@ static void receive_buf(struct virtnet_info *vi,
> struct receive_queue *rq,
> struct sk_buff *skb;
> struct virtio_net_hdr_mrg_rxbuf *hdr;
>
> - if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) {
> + if (unlikely(len < vi->hdr_len + ETH_HLEN)) {
> pr_debug("%s: short packet %i\n", dev->name, len);
> dev->stats.rx_length_errors++;
> if (vi->mergeable_rx_bufs) {
> --
> MST
Reviewed-by: Jason Wang <jasowang@redhat•com>
next prev parent reply other threads:[~2014-11-28 8:31 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1417118789-18231-1-git-send-email-mst@redhat.com>
2014-11-27 20:09 ` [PATCH v6 15/46] virtio_net: v1.0 endianness Michael S. Tsirkin
2014-11-27 20:09 ` [PATCH v6 23/46] virtio_net: pass vi around Michael S. Tsirkin
2014-11-27 20:09 ` [PATCH v6 24/46] virtio_net: get rid of virtio_net_hdr/skb_vnet_hdr Michael S. Tsirkin
2014-11-28 8:30 ` Jason Wang
2014-11-27 20:09 ` [PATCH v6 25/46] virtio_net: stricter short buffer length checks Michael S. Tsirkin
2014-11-28 8:31 ` Jason Wang [this message]
2014-11-27 20:10 ` [PATCH v6 26/46] virtio_net: bigger header when VERSION_1 is set Michael S. Tsirkin
2014-11-28 8:31 ` Jason Wang
2014-11-27 20:10 ` [PATCH v6 27/46] virtio_net: enable v1.0 support Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 28/46] vhost: make features 64 bit Michael S. Tsirkin
2014-11-28 8:32 ` Jason Wang
2014-11-27 20:10 ` [PATCH v6 29/46] vhost: add memory access wrappers Michael S. Tsirkin
2014-11-28 8:35 ` Jason Wang
2014-11-27 20:10 ` [PATCH v6 30/46] vhost/net: force len for TX to host endian Michael S. Tsirkin
2014-11-28 8:36 ` Jason Wang
2014-11-27 20:10 ` [PATCH v6 31/46] vhost: virtio 1.0 endian-ness support Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 32/46] vhost/net: virtio 1.0 byte swap Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 33/46] vhost/net: larger header for virtio 1.0 Michael S. Tsirkin
2014-11-28 8:38 ` Jason Wang
2014-11-27 20:10 ` [PATCH v6 34/46] virtio_net: disable mac write " Michael S. Tsirkin
2014-11-28 8:40 ` Jason Wang
2014-11-29 17:28 ` Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 35/46] vhost/net: enable " Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 36/46] vhost/net: suppress compiler warning Michael S. Tsirkin
2014-11-27 20:10 ` [PATCH v6 37/46] tun: move internal flag defines out of uapi Michael S. Tsirkin
[not found] ` <1417118789-18231-38-git-send-email-mst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-11-28 8:07 ` Jason Wang
[not found] ` <1417162052.5822.0-LLcwxoN42L4NLKR9yMNcA1aTQe2KTcn/@public.gmane.org>
2014-11-29 17:17 ` Michael S. Tsirkin
2014-11-27 20:11 ` [PATCH v6 38/46] tun: drop most type defines Michael S. Tsirkin
2014-11-28 8:09 ` Jason Wang
2014-11-29 17:23 ` Michael S. Tsirkin
2014-11-27 20:11 ` [PATCH v6 39/46] tun: add VNET_LE flag Michael S. Tsirkin
2014-11-27 20:11 ` [PATCH v6 40/46] tun: TUN_VNET_LE support, fix sparse warnings for virtio headers Michael S. Tsirkin
2014-11-28 8:19 ` Jason Wang
2014-11-27 20:11 ` [PATCH v6 41/46] macvtap: TUN_VNET_HDR support Michael S. Tsirkin
2014-11-28 8:24 ` Jason Wang
2014-11-27 20:11 ` [PATCH v6 45/46] vhost/scsi: partial virtio 1.0 support Michael S. Tsirkin
2014-11-27 20:11 ` [PATCH v6 46/46] af_packet: virtio 1.0 stubs 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=1417163479.5822.5@smtp.corp.redhat.com \
--to=jasowang@redhat$(echo .)com \
--cc=dahi@linux$(echo .)vnet.ibm.com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=rusty@au1$(echo .)ibm.com \
--cc=thuth@linux$(echo .)vnet.ibm.com \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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