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 ADD65C433ED for ; Tue, 27 Apr 2021 18:34:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84D50613EA for ; Tue, 27 Apr 2021 18:34:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238903AbhD0SfO (ORCPT ); Tue, 27 Apr 2021 14:35:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:49814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236651AbhD0SfM (ORCPT ); Tue, 27 Apr 2021 14:35:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D365761029; Tue, 27 Apr 2021 18:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619548469; bh=3gsB7rNmaJUC8iR7C3ear1cgA2aZu64+qFTQi/cM1wY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mWa5t9yDf8V99RnXQKZya1G7Rxj3s//7G+2yr9vRp1GZMhZEOnJKLuCcQAMQtjrjK DGszFRJqE/HFR3x/9oYcgVUwVycgbpPauS3tuxgvZbv/FAuW3B0IKMoOXzqsDlkUs9 6uWodv9o044TMLApozYFqHhtcItmBbC+G4ZqJoHU= Date: Tue, 27 Apr 2021 20:34:26 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" Subject: Re: [PATCH 131/190] Revert "net: 8390: fix potential NULL pointer dereferences" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-132-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-132-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 03:00:06PM +0200, Greg Kroah-Hartman wrote: > This reverts commit c7cbc3e937b885c9394bf9d0ca21ceb75c2ac262. > > 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: Kangjie Lu > Cc: David S. Miller > Signed-off-by: Greg Kroah-Hartman > --- > drivers/net/ethernet/8390/pcnet_cs.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c > index 9d3b1e0e425c..0a408fa2b7a4 100644 > --- a/drivers/net/ethernet/8390/pcnet_cs.c > +++ b/drivers/net/ethernet/8390/pcnet_cs.c > @@ -289,11 +289,6 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link) > > virt = ioremap(link->resource[2]->start, > resource_size(link->resource[2])); > - if (unlikely(!virt)) { > - pcmcia_release_window(link, link->resource[2]); > - return NULL; > - } > - > for (i = 0; i < NR_INFO; i++) { > pcmcia_map_mem_page(link, link->resource[2], > hw_info[i].offset & ~(resource_size(link->resource[2])-1)); > @@ -1430,11 +1425,6 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, > /* Try scribbling on the buffer */ > info->base = ioremap(link->resource[3]->start, > resource_size(link->resource[3])); > - if (unlikely(!info->base)) { > - ret = -ENOMEM; > - goto failed; > - } > - > for (i = 0; i < (TX_PAGES<<8); i += 2) > __raw_writew((i>>1), info->base+offset+i); > udelay(100); > -- > 2.31.1 > This change causes a memory leak on the error path, so I will keep the revert. But really, a pcmcia card with a failed ioremap() call? That can never happen here, so I'll just keep it reverted, it's not worth touching again. thanks, greg k-h