From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F92BC282C6 for ; Fri, 25 Jan 2019 08:12:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EF9521939 for ; Fri, 25 Jan 2019 08:12:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726761AbfAYIMd (ORCPT ); Fri, 25 Jan 2019 03:12:33 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2671 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726219AbfAYIMc (ORCPT ); Fri, 25 Jan 2019 03:12:32 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id BFD6B5DDC54D91D0BC1C; Fri, 25 Jan 2019 16:12:30 +0800 (CST) Received: from [127.0.0.1] (10.177.96.96) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.408.0; Fri, 25 Jan 2019 16:12:28 +0800 Subject: Re: [PATCH stable 4.4 05/11] ip: use rb trees for IP frag queue. To: Greg KH References: <1548209986-83527-1-git-send-email-maowenan@huawei.com> <1548209986-83527-6-git-send-email-maowenan@huawei.com> <20190124175800.GD7484@kroah.com> <3975b7f9-eb04-e288-276d-f8871f94bc22@huawei.com> <20190125070754.GA11152@kroah.com> CC: , , , , From: maowenan Message-ID: <4f47bab5-0852-9673-3a75-834426412a50@huawei.com> Date: Fri, 25 Jan 2019 16:12:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20190125070754.GA11152@kroah.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.96.96] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 >>>> >>>> [ 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 Date: Tue Sep 19 05:14:24 2017 -0700 net: sk_buff rbnode reorg commit fa0f527358bd900ef92f925878ed6bfbd51305cc Author: Peter Oskolkov 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 Date: Thu Sep 13 07:58:58 2018 -0700 net: sk_buff rbnode reorg > > thanks, > > greg k-h > >