[3.13.y-ckt,stable] Patch "drivers/net: Disable UFO through virtio" has been added to staging queue

This is a note to let you know that I have just added a patch titled

    drivers/net: Disable UFO through virtio

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt13.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

From 852a3b019358f23ecb666f5d62fbbdaf07539f96 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 30 Oct 2014 18:27:12 +0000
Subject: drivers/net: Disable UFO through virtio

[ Upstream commit 3d0ad09412ffe00c9afa201d01effdb6023d09b4 ]

IPv6 does not allow fragmentation by routers, so there is no
fragmentation ID in the fixed header.  UFO for IPv6 requires the ID to
be passed separately, but there is no provision for this in the virtio
net protocol.

Until recently our software implementation of UFO/IPv6 generated a new
ID, but this was a bug.  Now we will use ID=0 for any UFO/IPv6 packet
passed through a tap, which is even worse.

Unfortunately there is no distinction between UFO/IPv4 and v6
features, so disable UFO on taps and virtio_net completely until we
have a proper solution.

We cannot depend on VM managers respecting the tap feature flags, so
keep accepting UFO packets but log a warning the first time we do
this.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/net/macvtap.c    | 13 +++++--------
 drivers/net/tun.c        | 19 +++++++++++--------
 drivers/net/virtio_net.c | 24 ++++++++++++++----------
 3 files changed, 30 insertions(+), 26 deletions(-)

--
1.9.1

On Mon, 2014-12-08 at 20:11 +0000, Ben Hutchings wrote:
> On Mon, 2014-12-08 at 12:10 -0800, Kamal Mostafa wrote:
> > This is a note to let you know that I have just added a patch titled
> > 
> >     drivers/net: Disable UFO through virtio
> > 
> > to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
> > which can be found at:
> > 
> >  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue
> > 
> > This patch is scheduled to be released in version 3.13.11-ckt13.
> > 
> > If you, or anyone else, feels it should not be added to this tree, please 
> > reply to this email.
> [...]
> 
> You should drop this as part of it needs to be reverted and that patch
> hasn't been applied upstream yet.

Okay, I'll drop "Disable UFO through virtio" from 3.13-stable.

But what about this subsequent UFO patch which refers to UFO being 'now
disabled'?  Drop this too, or leave it in?:

    drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
    
    [ Upstream commit 5188cd44c55db3e92cd9e77a40b5baa7ed4340f7 ]
    
    UFO is now disabled on all drivers that work with virtio net headers,
    but userland may try to send UFO/IPv6 packets anyway.  Instead of
    sending with ID=0, we should select identifiers on their behalf (as we
    used to).
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>

Thanks very much, Ben!

 -Kamal

On Tue, 2014-12-09 at 08:42 -0800, Kamal Mostafa wrote:
> On Mon, 2014-12-08 at 20:11 +0000, Ben Hutchings wrote:
> > On Mon, 2014-12-08 at 12:10 -0800, Kamal Mostafa wrote:
> > > This is a note to let you know that I have just added a patch titled
> > > 
> > >     drivers/net: Disable UFO through virtio
> > > 
> > > to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
> > > which can be found at:
> > > 
> > >  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue
> > > 
> > > This patch is scheduled to be released in version 3.13.11-ckt13.
> > > 
> > > If you, or anyone else, feels it should not be added to this tree, please 
> > > reply to this email.
> > [...]
> > 
> > You should drop this as part of it needs to be reverted and that patch
> > hasn't been applied upstream yet.
> 
> Okay, I'll drop "Disable UFO through virtio" from 3.13-stable.
> 
> But what about this subsequent UFO patch which refers to UFO being 'now
> disabled'?  Drop this too, or leave it in?:
> 
>     drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
>     
>     [ Upstream commit 5188cd44c55db3e92cd9e77a40b5baa7ed4340f7 ]
>     
>     UFO is now disabled on all drivers that work with virtio net headers,
>     but userland may try to send UFO/IPv6 packets anyway.  Instead of
>     sending with ID=0, we should select identifiers on their behalf (as we
>     used to).
>     
>     Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
>     Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
>     Signed-off-by: David S. Miller <davem@davemloft.net>
>     Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> 
> Thanks very much, Ben!

That's still a useful fix, but will have some fuzz.

Ben.

On Tue, Dec 09, 2014 at 05:02:11PM +0000, Ben Hutchings wrote:
> On Tue, 2014-12-09 at 08:42 -0800, Kamal Mostafa wrote:
> > On Mon, 2014-12-08 at 20:11 +0000, Ben Hutchings wrote:
> > > On Mon, 2014-12-08 at 12:10 -0800, Kamal Mostafa wrote:
> > > > This is a note to let you know that I have just added a patch titled
> > > > 
> > > >     drivers/net: Disable UFO through virtio
> > > > 
> > > > to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
> > > > which can be found at:
> > > > 
> > > >  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue
> > > > 
> > > > This patch is scheduled to be released in version 3.13.11-ckt13.
> > > > 
> > > > If you, or anyone else, feels it should not be added to this tree, please 
> > > > reply to this email.
> > > [...]
> > > 
> > > You should drop this as part of it needs to be reverted and that patch
> > > hasn't been applied upstream yet.
> > 
> > Okay, I'll drop "Disable UFO through virtio" from 3.13-stable.
> > 
> > But what about this subsequent UFO patch which refers to UFO being 'now
> > disabled'?  Drop this too, or leave it in?:
> > 
> >     drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
> >     
> >     [ Upstream commit 5188cd44c55db3e92cd9e77a40b5baa7ed4340f7 ]
> >     
> >     UFO is now disabled on all drivers that work with virtio net headers,
> >     but userland may try to send UFO/IPv6 packets anyway.  Instead of
> >     sending with ID=0, we should select identifiers on their behalf (as we
> >     used to).
> >     
> >     Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> >     Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
> >     Signed-off-by: David S. Miller <davem@davemloft.net>
> >     Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > 
> > Thanks very much, Ben!
> 
> That's still a useful fix, but will have some fuzz.
> 
> Ben.

I guess this also applies to the 3.16 kernel as well; I dropped both
patches earlier:

 3d0ad09412ff drivers/net: Disable UFO through virtio
 5188cd44c55d drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets

but I should have kept the second one.  I'll queue it again for the
next release.

Cheers,
--
Luís