From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH v4.14-stable] sch_netem: restore skb->dev after dequeuing
 from the rbtree
Date: Wed, 31 Oct 2018 09:44:36 -0400
Message-ID: <20181031134436.GH194472@sasha-vm>
References: <20181018203840.87884-1-cpaasch@apple.com>
 <20181018.154348.2028947036934395230.davem@davemloft.net>
 <20181030191251.GE25819@u40b0340c692b58f6553c.ant.amazon.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Cc: David Miller <davem@davemloft.net>, gregkh@linuxfoundation.org,
        cpaasch@apple.com, netdev@vger.kernel.org, stable@vger.kernel.org,
        stephen@networkplumber.org, luqia@amazon.com, edumazet@google.com,
        soheil@google.com, weiwan@google.com, willemb@google.com
To: Eduardo Valentin <eduval@amazon.com>
Return-path: <stable-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20181030191251.GE25819@u40b0340c692b58f6553c.ant.amazon.com>
Sender: stable-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

On Tue, Oct 30, 2018 at 12:12:51PM -0700, Eduardo Valentin wrote:
>Greg,
>
>On Thu, Oct 18, 2018 at 03:43:48PM -0700, David Miller wrote:
>> From: Christoph Paasch <cpaasch@apple.com>
>> Date: Thu, 18 Oct 2018 13:38:40 -0700
>>
>> > Upstream commit bffa72cf7f9d ("net: sk_buff rbnode reorg") got
>> > backported as commit 6b921536f170 ("net: sk_buff rbnode reorg") into the
>> > v4.14.x-tree.
>> >
>> > However, the backport does not include the changes in sch_netem.c
>> >
>> > We need these, as otherwise the skb->dev pointer is not set when
>> > dequeueing from the netem rbtree, resulting in a panic:
>>  ...
>> > Fixes: 6b921536f170 ("net: sk_buff rbnode reorg")
>> > Cc: Stephen Hemminger <stephen@networkplumber.org>
>> > Cc: Eric Dumazet <edumazet@google.com>
>> > Cc: Soheil Hassas Yeganeh <soheil@google.com>
>> > Cc: Wei Wang <weiwan@google.com>
>> > Cc: Willem de Bruijn <willemb@google.com>
>> > Signed-off-by: Christoph Paasch <cpaasch@apple.com>
>> > ---
>> >
>> > Notes:
>> >     This patch should only make it into v4.14-stable as that's the only branch where
>> >     the offending commit has been backported to.
>>
>> Greg, please queue up.
>
>Are you planing to queue this one ?
>
>Looks to me it was a miss on the backport.
>
>It seams that the backport was touching different files, and missed the change
>on net/sched/sch_netem.c. So, to me, even if this patch may not follow the
>strictly the rules of stable, as it is not a patch in upstream, seams to be a
>needed change, even if it is specific to stable linux-4.14.y.

I've queued this patch for 4.14.