Re: [PATCH v4.14-stable] sch_netem: restore skb->dev after dequeuing from the rbtree
From: Sasha Levin <sashal@kernel.org>
Date: 2018-10-31 22:42:43
Also in:
stable
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:quoted
From: Christoph Paasch <redacted> Date: Thu, 18 Oct 2018 13:38:40 -0700quoted
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:...quoted
Fixes: 6b921536f170 ("net: sk_buff rbnode reorg") Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Eric Dumazet <edumazet@google.com> Cc: Soheil Hassas Yeganeh <redacted> Cc: Wei Wang <redacted> Cc: Willem de Bruijn <willemb@google.com> Signed-off-by: Christoph Paasch <redacted> --- 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.