41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 039bee8e4ee644720e8c234562c9228c1179bb1c Mon Sep 17 00:00:00 2001
|
|
From: Jason Wang <jasowang@redhat.com>
|
|
Date: Wed, 5 Aug 2015 10:34:04 +0800
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/virtio_net.c | 4 ++--
|
|
1 file 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)
|
|
/* 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
|
|
--
|
|
2.4.3
|
|
|