Re: [PATCH 043/190] Revert "qlcnic: fix missing release in qlcnic_83xx_interrupt_test."

Greg Kroah-Hartman
2021-04-28T07:13:58Z

On Wed, Apr 21, 2021 at 02:58:38PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 15c973858903009e995b2037683de29dfe968621.
>
> 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/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
> index d8882d0b6b49..edefeeff60f4 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
> @@ -3649,7 +3649,7 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)
> ahw->diag_cnt = 0;
> ret = qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INTRPT_TEST);
> if (ret)
> - goto fail_mbx_args;
> + goto fail_diag_irq;
>
> if (adapter->flags & QLCNIC_MSIX_ENABLED)
> intrpt_id = ahw->intr_tbl[0].id;
> @@ -3679,8 +3679,6 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)
>
> done:
> qlcnic_free_mbx_args(&cmd);
> -
> -fail_mbx_args:
> qlcnic_83xx_diag_free_res(netdev, drv_sds_rings);
>
> fail_diag_irq:
> --
> 2.31.1
>

The original change here looks correct, I will drop the revert.

greg k-h