On 2019/1/25 15:07, Greg KH wrote:
On Fri, Jan 25, 2019 at 09:50:35AM +0800, maowenan wrote:
On 2019/1/25 1:58, Greg KH wrote:
On Wed, Jan 23, 2019 at 10:19:40AM +0800, Mao Wenan wrote:
From: Peter Oskolkov posk@google.com
[ Upstream commit fa0f527358bd900ef92f925878ed6bfbd51305cc ]
This commit is not in the 4.14.y tree, any specific reason why not?
I found the commit 6b921536f1707a240e6f53843f1f26231016fda5 net: sk_buff rbnode reorg in v4.14.y including the fixes.
Yes, that commit is really bffa72cf7f9d ("net: sk_buff rbnode reorg"), which is upstream in 4.14.15 and 4.15. But fa0f527358bd ("ip: use rb trees for IP frag queue.") is not in 4.14 at all, it showed up in 4.9.134 and 4.19. Why did the 4.14 tree not need it and 4.9 and 4.4 does?
The commit 6b921536f170(net: sk_buff rbnode reorg) in 4.14 combined two commits in mainline(bffa72cf7f9d net: sk_buff rbnode reorg. and fa0f527358bd ip: use rb trees for IP frag queue.). The main fix patch for CVE-2018-5391 is fa0f527358bd(ip: use rb trees for IP frag queue), I don't think it is necessary to backport bffa72cf7f9d to 4.14, but the fa0f527358bd is really needed.
mainline patches commit bffa72cf7f9df842f0016ba03586039296b4caaf Author: Eric Dumazet edumazet@google.com Date: Tue Sep 19 05:14:24 2017 -0700
net: sk_buff rbnode reorg
commit fa0f527358bd900ef92f925878ed6bfbd51305cc Author: Peter Oskolkov posk@google.com Date: Thu Aug 2 23:34:39 2018 +0000
ip: use rb trees for IP frag queue.
linux-4.14.y commit 6b921536f1707a240e6f53843f1f26231016fda5 Author: Eric Dumazet edumazet@google.com Date: Thu Sep 13 07:58:58 2018 -0700
net: sk_buff rbnode reorg
thanks,
greg k-h