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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 CC90CC433ED for ; Wed, 28 Apr 2021 07:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B510601FC for ; Wed, 28 Apr 2021 07:12:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235087AbhD1HN1 (ORCPT ); Wed, 28 Apr 2021 03:13:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:59956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229643AbhD1HN0 (ORCPT ); Wed, 28 Apr 2021 03:13:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6FB5B613DC; Wed, 28 Apr 2021 07:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619593961; bh=7v+xaRxAqtmDAUOE8Tqu0GK3pp+dZezxoCjvSINuU6w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=2UDigCzqveIvyzp2iNKTR1gvty5j1OTRed0E/pO5qjzZCEpV0wAuSwtMXZKc9/i18 6kSrUe/ivYi0QwhgGPc1SK+BD6DAdrB1n4DDmpWCStHDLhokAN4o9/+PgMY+72cq38 ysppkj6P8vZWZCB3esF3rccmOKbTOBMR36/bBw/U= Date: Wed, 28 Apr 2021 09:12:38 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Qiushi Wu , "David S . Miller" Subject: Re: [PATCH 048/190] Revert "net: sun: fix missing release regions in cas_init_one()." Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-49-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-49-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 02:58:43PM +0200, Greg Kroah-Hartman wrote: > This reverts commit 5a730153984dd13f82ffae93d7170d76eba204e9. > > Commits from @umn.edu addresses have been found to be submitted in "bad > faith" to try to test the kernel community's ability to review "known > malicious" changes. The result of these submissions can be found in a > paper published at the 42nd IEEE Symposium on Security and Privacy > entitled, "Open Source Insecurity: Stealthily Introducing > Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University > of Minnesota) and Kangjie Lu (University of Minnesota). > > Because of this, all submissions from this group must be reverted from > the kernel tree and will need to be re-reviewed again to determine if > they actually are a valid fix. Until that work is complete, remove this > change to ensure that no problems are being introduced into the > codebase. > > Cc: Qiushi Wu > Cc: David S. Miller > Signed-off-by: Greg Kroah-Hartman > --- > drivers/net/ethernet/sun/cassini.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c > index 9ff894ba8d3e..d9cdf51c5a33 100644 > --- a/drivers/net/ethernet/sun/cassini.c > +++ b/drivers/net/ethernet/sun/cassini.c > @@ -4956,7 +4956,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > cas_cacheline_size)) { > dev_err(&pdev->dev, "Could not set PCI cache " > "line size\n"); > - goto err_out_free_res; > + goto err_write_cacheline; > } > } > #endif > @@ -5128,6 +5128,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > err_out_free_res: > pci_release_regions(pdev); > > +err_write_cacheline: > /* Try to restore it in case the error occurred after we > * set it. > */ > -- > 2.31.1 > This change looks correct to me, so I will drop the revert. greg k-h