Re: [PATCH 048/190] Revert "net: sun: fix missing release regions in cas_init_one()."

Greg Kroah-Hartman
2021-04-28T07:12:44Z

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 <wu000273@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> 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