* [linux 3.14-stable] virtio-net: drop NETIF_F_FRAGLIST
@ 2015-09-29 20:00 Charles (Chas) Williams
0 siblings, 0 replies; only message in thread
From: Charles (Chas) Williams @ 2015-09-29 20:00 UTC (permalink / raw)
To: davem; +Cc: netdev
From: Jason Wang <jasowang@redhat•com>
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.
Fixes CVE-2015-5156.
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>
Signed-off-by: Chas Williams <3chas3@gmail•com>
---
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 841b608..5c150a0 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
--
2.1.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-09-29 20:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-29 20:00 [linux 3.14-stable] virtio-net: drop NETIF_F_FRAGLIST Charles (Chas) Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox