diff options
author | Jason Wang <jasowang@redhat.com> | 2015-08-04 22:34:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-07 03:13:10 -0400 |
commit | 48900cb6af4282fa0fb6ff4d72a81aa3dadb5c39 (patch) | |
tree | 88e6e94b088e0d2fdfa627b8f5f1683a184d4c17 | |
parent | 4f7eb70f7be1099236670f36b2f1f90a63e29699 (diff) |
virtio-net: drop NETIF_F_FRAGLIST
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>
-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 7fbca37a1adf..237f8e5e493d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
1756 | /* Do we support "hardware" checksums? */ | 1756 | /* Do we support "hardware" checksums? */ |
1757 | if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) { | 1757 | if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) { |
1758 | /* This opens up the world of extra features. */ | 1758 | /* This opens up the world of extra features. */ |
1759 | dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; | 1759 | dev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_SG; |
1760 | if (csum) | 1760 | if (csum) |
1761 | dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; | 1761 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; |
1762 | 1762 | ||
1763 | if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) { | 1763 | if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) { |
1764 | dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO | 1764 | dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO |