lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 091/107] virtio-net: drop NETIF_F_FRAGLIST
    3.2.72-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jason Wang <jasowang@redhat.com>

    commit 48900cb6af4282fa0fb6ff4d72a81aa3dadb5c39 upstream.

    virtio declares support for NETIF_F_FRAGLIST, but assumes
    that there are at most MAX_SKB_FRAGS + 2 fragments which isn't
    always true with a fraglist.

    A longer fraglist in the skb will make the call to skb_to_sgvec overflow
    the sg array, leading to memory corruption.

    Drop NETIF_F_FRAGLIST so we only get what we can handle.

    Cc: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Jason Wang <jasowang@redhat.com>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/virtio_net.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -981,9 +981,9 @@ static int virtnet_probe(struct virtio_d
    /* Do we support "hardware" checksums? */
    if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
    /* This opens up the world of extra features. */
    - dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
    + dev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_SG;
    if (csum)
    - dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
    + dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;

    if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
    dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO


    \
     
     \ /
      Last update: 2015-10-09 03:01    [W:3.514 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site