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 D0127C433ED for ; Tue, 27 Apr 2021 17:33:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD2B6613C0 for ; Tue, 27 Apr 2021 17:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236713AbhD0ReV (ORCPT ); Tue, 27 Apr 2021 13:34:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:42774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbhD0ReU (ORCPT ); Tue, 27 Apr 2021 13:34:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 206B7613C0; Tue, 27 Apr 2021 17:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619544816; bh=Mn4aRqN72i4AwLxFlGfAdoAsZ5Ijyi1NHaS6dvgfVIo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=11G1xwAhhsWTcF7bNJoNKy10czMd7oJg1UnjwOxHPqidgI19dNkrWnjEOs2kowvRq A5MGWiD5PSPp2VrNgpASRZM1bWxzlfIGIEay2Tc5jKnjzRSj3wo25LkkJ2V+htfqlI HojZMaFp3weMS39UY3UOgtk9k8qMZRNGVE9e5jnU= Date: Tue, 27 Apr 2021 19:33:34 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Aditya Pakki , Mark Brown Subject: Re: [PATCH 124/190] Revert "spi : spi-topcliff-pch: Fix to handle empty DMA buffers" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-125-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-125-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 02:59:59PM +0200, Greg Kroah-Hartman wrote: > This reverts commit f37d8e67f39e6d3eaf4cc5471e8a3d21209843c6. > > 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: Aditya Pakki > Cc: Mark Brown > Signed-off-by: Greg Kroah-Hartman > --- > drivers/spi/spi-topcliff-pch.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c > index b459e369079f..12d749e9436b 100644 > --- a/drivers/spi/spi-topcliff-pch.c > +++ b/drivers/spi/spi-topcliff-pch.c > @@ -1290,27 +1290,18 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat, > dma->rx_buf_virt, dma->rx_buf_dma); > } > > -static int pch_alloc_dma_buf(struct pch_spi_board_data *board_dat, > +static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat, > struct pch_spi_data *data) > { > struct pch_spi_dma_ctrl *dma; > - int ret; > > dma = &data->dma; > - ret = 0; > /* Get Consistent memory for Tx DMA */ > dma->tx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev, > PCH_BUF_SIZE, &dma->tx_buf_dma, GFP_KERNEL); > - if (!dma->tx_buf_virt) > - ret = -ENOMEM; > - > /* Get Consistent memory for Rx DMA */ > dma->rx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev, > PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL); > - if (!dma->rx_buf_virt) > - ret = -ENOMEM; > - > - return ret; > } > > static int pch_spi_pd_probe(struct platform_device *plat_dev) > @@ -1387,9 +1378,7 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev) > > if (use_dma) { > dev_info(&plat_dev->dev, "Use DMA for data transfers\n"); > - ret = pch_alloc_dma_buf(board_dat, data); > - if (ret) > - goto err_spi_register_master; > + pch_alloc_dma_buf(board_dat, data); > } > > ret = spi_register_master(master); > -- > 2.31.1 > THis looks correct, so I'll drop the revert. thanks, greg k-h