* [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST
@ 2015-08-05 2:34 Jason Wang
2015-08-05 6:33 ` Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jason Wang @ 2015-08-05 2:34 UTC (permalink / raw)
To: mst, virtualization, netdev, linux-kernel; +Cc: sergei.shtylyov
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>
---
- Change from V1: coding style fixes.
- The patch is needed for stable.
---
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 7fbca37..237f8e5 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.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST
2015-08-05 2:34 [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST Jason Wang
@ 2015-08-05 6:33 ` Michael S. Tsirkin
2015-08-06 13:13 ` Michael S. Tsirkin
2015-08-07 7:13 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-08-05 6:33 UTC (permalink / raw)
To: Jason Wang; +Cc: virtualization, netdev, linux-kernel, sergei.shtylyov
On Wed, Aug 05, 2015 at 10:34:04AM +0800, Jason Wang wrote:
> 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>
> ---
> - Change from V1: coding style fixes.
> - The patch is needed for stable.
> ---
> 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 7fbca37..237f8e5 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.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST
2015-08-05 2:34 [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST Jason Wang
2015-08-05 6:33 ` Michael S. Tsirkin
@ 2015-08-06 13:13 ` Michael S. Tsirkin
2015-08-06 22:49 ` David Miller
2015-08-07 7:13 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-08-06 13:13 UTC (permalink / raw)
To: Jason Wang
Cc: netdev, David Miller, linux-kernel, sergei.shtylyov,
virtualization
On Wed, Aug 05, 2015 at 10:34:04AM +0800, Jason Wang wrote:
> 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>
I noticed only now that this didn't Cc Dave, so of course it's
not applied. I'm preparing a pull request anyway, so
I'll merge this through my tree, and add Cc stable.
Dave - ok with you?
> ---
> - Change from V1: coding style fixes.
> - The patch is needed for stable.
> ---
> 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 7fbca37..237f8e5 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.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST
2015-08-06 13:13 ` Michael S. Tsirkin
@ 2015-08-06 22:49 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2015-08-06 22:49 UTC (permalink / raw)
To: mst; +Cc: netdev, linux-kernel, sergei.shtylyov, virtualization
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Thu, 6 Aug 2015 16:13:11 +0300
> On Wed, Aug 05, 2015 at 10:34:04AM +0800, Jason Wang wrote:
>> 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>
>
> I noticed only now that this didn't Cc Dave, so of course it's
> not applied.
CC:'ing me isn't the requirement. CC:'ing netdev is, which he
did. If you check patchwork, it's there in the queue.
I'm just behind and heavily backlogged because I've been working
on other things.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST
2015-08-05 2:34 [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST Jason Wang
2015-08-05 6:33 ` Michael S. Tsirkin
2015-08-06 13:13 ` Michael S. Tsirkin
@ 2015-08-07 7:13 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2015-08-07 7:13 UTC (permalink / raw)
To: jasowang; +Cc: mst, virtualization, netdev, linux-kernel, sergei.shtylyov
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 5 Aug 2015 10:34:04 +0800
> 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>
Applied, thanks Jason.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-07 7:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-05 2:34 [PATCH net V2] virtio-net: drop NETIF_F_FRAGLIST Jason Wang
2015-08-05 6:33 ` Michael S. Tsirkin
2015-08-06 13:13 ` Michael S. Tsirkin
2015-08-06 22:49 ` David Miller
2015-08-07 7:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).