From: Jason Wang Date: Wed, 5 Aug 2015 02:34:04 +0000 (+0800) Subject: virtio-net: drop NETIF_F_FRAGLIST X-Git-Tag: v2.6.32.69~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bce7c92e9c2f76cb4f44a360ac0de083ca13dd2f;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Jason Wang Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller [bwh: Backported to 2.6.32: there's only a single features field] Signed-off-by: Ben Hutchings Signed-off-by: Willy Tarreau --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 97a56f0f1af01..2bc66619d3466 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -868,7 +868,7 @@ static int virtnet_probe(struct virtio_device *vdev) /* Do we support "hardware" checksums? */ if (csum && virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) { /* This opens up the world of extra features. */ - dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; + dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; if (gso && virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) { dev->features |= NETIF_F_TSO | NETIF_F_UFO | NETIF_F_TSO_ECN | NETIF_F_TSO6;