From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.linuxfoundation.org ([140.211.169.12]:44586 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751759AbdATIig (ORCPT
        <rfc822;stable@vger.kernel.org>); Fri, 20 Jan 2017 03:38:36 -0500
Date: Fri, 20 Jan 2017 09:28:13 +0100
From: Greg KH <gregkh@linuxfoundation.org>
To: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: alexander.levin@verizon.com,
        Thomas Deutschmann <whissi@gentoo.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "jesse@kernel.org" <jesse@kernel.org>,
        "davem@davemloft.net" <davem@davemloft.net>
Subject: Re: [E] Re: Patch "tunnels: Don't apply GRO to multiple layers of
 encapsulation" (CVE-2016-8666) is missing in 4.1 and 3.18 stable tree
Message-ID: <20170120082813.GA28701@kroah.com>
References: <28652eb8-605a-d361-afc3-01f4463c54d4@gentoo.org>
 <20170110064548.GA29873@kroah.com>
 <20170112170836.5dzdxjfcrbx6en3c@sasha-lappy>
 <CAKPo+=esbKa7mwgKjo6+sDy+qtQ-GOdx_g_RkP5DqPj5U5cKPQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKPo+=esbKa7mwgKjo6+sDy+qtQ-GOdx_g_RkP5DqPj5U5cKPQ@mail.gmail.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Fri, Jan 20, 2017 at 08:14:23AM +0900, Seung-Woo Kim wrote:
> Hi,
> 
> On Fri, Jan 13, 2017 at 2:51 AM,  <alexander.levin@verizon.com> wrote:
> > On Tue, Jan 10, 2017 at 07:45:48AM +0100, Greg KH wrote:
> >> On Tue, Jan 10, 2017 at 03:09:28AM +0100, Thomas Deutschmann wrote:
> >> > Hi,
> >> >
> >> > the following patch was backported to the following LTS kernels
> >> >
> >> > - >=4.4.29
> >> > - >=3.16.35
> >> >
> >> >
> >> > however it is missing from LTS kernels
> >> >
> >> > - linux-4.1
> >> > - linux-3.18
> >>
> >> 3.18 is (or should be), end-of-life now (Sasha, can we just kill it?
> >> Please?)
> >>
> >> 4.1 is a bit slower release cycle, and again, Sasha will speak to that.
> >
> > I'll add commit to both, and will do final release for 3.18 in a couple of days.
> 
> The commit is applied linux-4.1.y and linux-3.18.y, but it causes
> build warning about unused function sit_gro_receive.
> 
> It seems that the following part of mainline commit is missed.
> 
>  static int ipv6_gro_complete(struct sk_buff *skb, int nhoff)
>  {
>   const struct net_offload *ops;
> @@ -302,7 +315,7 @@ static struct packet_offload ipv6_packet
>  static const struct net_offload sit_offload = {
>   .callbacks = {
>   .gso_segment = ipv6_gso_segment,
> - .gro_receive    = ipv6_gro_receive,
> + .gro_receive    = sit_gro_receive,
>   .gro_complete   = sit_gro_complete,
>   },
>  };

Ah, nice catch.

Sasha, want to add this to the trees and do another release?  Or I can
do it if you don't want to, for 3.18.y

thanks,

greg k-h