diff options
| author | Jason Wang <jasowang@redhat.com> | 2015-08-05 10:34:04 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-11 17:24:16 +0100 |
| commit | 319e98c7b06b67d7005911d47949bfbc1be4eaaf (patch) | |
| tree | aef98ac9c2f955a693e09c2eba736c5c7ff6de7a | |
| parent | fd0ad1be8dfb877e31f07f11c120badce12ba09f (diff) | |
| download | linux-stable-319e98c7b06b67d7005911d47949bfbc1be4eaaf.tar.gz linux-stable-319e98c7b06b67d7005911d47949bfbc1be4eaaf.tar.bz2 linux-stable-319e98c7b06b67d7005911d47949bfbc1be4eaaf.zip | |
virtio-net: drop NETIF_F_FRAGLIST
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>
Cc: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/net/virtio_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7d9f84a91f37..0ef4ee7289b4 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1652,9 +1652,9 @@ static int virtnet_probe(struct virtio_device *vdev) /* 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 |