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, URIBL_BLOCKED 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 73BC7C433B4 for ; Thu, 29 Apr 2021 13:54:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F5E6613B1 for ; Thu, 29 Apr 2021 13:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237915AbhD2NzK (ORCPT ); Thu, 29 Apr 2021 09:55:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233862AbhD2NzG (ORCPT ); Thu, 29 Apr 2021 09:55:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 344F861407; Thu, 29 Apr 2021 13:54:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619704458; bh=y/KSgaD2/mqGMlekuhyd5x478LgNEJTau9K+E8yRMlY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SfYs0JlfAyjPspN8DJlYf1seeCx45i8MoX8QD7xYEL9Vi8Fvdz5rnpIBpref/AQSJ 5jVuVicHwjQIYXHDtQrySVwEDqugFUZ00qIWeJD2Zo2o2B+TLmIkrsgga+2JShOWyO 1k9nU+ZZa9RS6Y7B5MzYNSm2FgrgsNT4cQS2B3GQ= Date: Thu, 29 Apr 2021 15:54:16 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Aditya Pakki , "David S . Miller" Subject: Re: [PATCH 1/7] Revert "rocker: fix incorrect error handling in dma_rings_init" Message-ID: References: <20210429130811.3353369-1-gregkh@linuxfoundation.org> <20210429130811.3353369-2-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210429130811.3353369-2-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: David S. Miller > Signed-off-by: Greg Kroah-Hartman > --- > 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