Re: [PATCH 1/7] Revert "rocker: fix incorrect error handling in dma_rings_init"

Greg Kroah-Hartman
2021-04-29T13:54:25Z

On Thu, Apr 29, 2021 at 03:08:05PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 58d0c864e1a759a15c9df78f50ea5a5c32b3989e.
>
> 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 submitted to 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) but later
> withdrawn.
>
> 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: Aditya Pakki <pakki001@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/net/ethernet/rocker/rocker_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
> index 3473d296b2e2..35ebeeb40639 100644
> --- a/drivers/net/ethernet/rocker/rocker_main.c
> +++ b/drivers/net/ethernet/rocker/rocker_main.c
> @@ -650,10 +650,10 @@ static int rocker_dma_rings_init(struct rocker *rocker)
> err_dma_event_ring_bufs_alloc:
> rocker_dma_ring_destroy(rocker, &rocker->event_ring);
> err_dma_event_ring_create:
> - rocker_dma_cmd_ring_waits_free(rocker);
> -err_dma_cmd_ring_waits_alloc:
> rocker_dma_ring_bufs_free(rocker, &rocker->cmd_ring,
> DMA_BIDIRECTIONAL);
> +err_dma_cmd_ring_waits_alloc:
> + rocker_dma_cmd_ring_waits_free(rocker);
> err_dma_cmd_ring_bufs_alloc:
> rocker_dma_ring_destroy(rocker, &rocker->cmd_ring);
> return err;
> --
> 2.31.1
>

The original commit here looks correct to me, so unless someone objects,
I'll drop this revert from my tree.

thanks,

greg k-h