From: Jason Wang Date: Tue, 4 Aug 2015 18:34:04 +0000 (+0800) Subject: virtio-net: drop NETIF_F_FRAGLIST X-Git-Tag: v4.1.12-92~237^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5060d421f203ed08e27732e76b68b648ba86496e;p=users%2Fjedix%2Flinux-maple.git virtio-net: drop NETIF_F_FRAGLIST virtio-net: drop NETIF_F_FRAGLIST Orabug: 22154074 CVE-2015-5156 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 Signed-off-by: Jason Wang Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller (cherry picked from commit 48900cb6af4282fa0fb6ff4d72a81aa3dadb5c39) Signed-off-by: Brian Maly --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 63c7810e1545..6ac04e2bff07 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