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=-21.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_SANE_1 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 C5FCBC43214 for ; Wed, 1 Sep 2021 01:51:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACEEA6103D for ; Wed, 1 Sep 2021 01:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241694AbhIABwr (ORCPT ); Tue, 31 Aug 2021 21:52:47 -0400 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:41096 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231396AbhIABwp (ORCPT ); Tue, 31 Aug 2021 21:52:45 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=alimailimapcm10staff010182156082;MF=yun.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0UmngFU2_1630461105; Received: from testdeMacBook-Pro.local(mailfrom:yun.wang@linux.alibaba.com fp:SMTPD_---0UmngFU2_1630461105) by smtp.aliyun-inc.com(127.0.0.1); Wed, 01 Sep 2021 09:51:46 +0800 Subject: Re: [PATCH v2] net: fix NULL pointer reference in cipso_v4_doi_free To: Paul Moore Cc: Jakub Kicinski , "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , netdev@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org References: <18f0171e-0cc8-6ae6-d04a-a69a2a3c1a39@linux.alibaba.com> <20210830094525.3c97e460@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> <84262e7b-fda6-9d7d-b0bd-1bb0e945e6f9@linux.alibaba.com> From: =?UTF-8?B?546L6LSH?= Message-ID: <1ed31e79-809b-7ac9-2760-869570ac22ea@linux.alibaba.com> Date: Wed, 1 Sep 2021 09:51:28 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/8/31 下午9:48, Paul Moore wrote: > On Mon, Aug 30, 2021 at 10:42 PM 王贇 wrote: >> On 2021/8/31 上午12:50, Paul Moore wrote: >> [SNIP] >>>>>> Reported-by: Abaci >>>>>> Signed-off-by: Michael Wang >>>>>> --- >>>>>> net/netlabel/netlabel_cipso_v4.c | 4 ++-- >>>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> I see this was already merged, but it looks good to me, thanks for >>>>> making those changes. >>>> >>>> FWIW it looks like v1 was also merged: >>>> >>>> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=733c99ee8b >>> >>> Yeah, that is unfortunate, there was a brief discussion about that >>> over on one of the -stable patches for the v1 patch (odd that I never >>> saw a patchbot post for the v1 patch?). Having both merged should be >>> harmless, but we want to revert the v1 patch as soon as we can. >>> Michael, can you take care of this? >> >> As v1 already merged, may be we could just goon with it? >> >> Actually both working to fix the problem, v1 will cover all the >> cases, v2 take care one case since that's currently the only one, >> but maybe there will be more in future. > > No. Please revert v1 and stick with the v2 patch. The v1 patch is in > my opinion a rather ugly hack that addresses the symptom of the > problem and not the root cause. > > It isn't your fault that both v1 and v2 were merged, but I'm asking > you to help cleanup the mess. If you aren't able to do that please > let us know so that others can fix this properly. No problem I can help on that, just try to make sure it's not a meaningless work. So would it be fine to send out a v3 which revert v1 and apply v2? Regards, Michael Wang >