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 0DF2CC433B4 for ; Tue, 27 Apr 2021 18:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3284613C8 for ; Tue, 27 Apr 2021 18:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238634AbhD0STC (ORCPT ); Tue, 27 Apr 2021 14:19:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238516AbhD0STA (ORCPT ); Tue, 27 Apr 2021 14:19:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 51BB5613EA; Tue, 27 Apr 2021 18:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619547496; bh=kJLFQggora38FymSwghRyb6zbzCeHqF2LYpygDlY+1A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SCYlm/E12DLtdYRqltVpBck2NmlDNtWax1FL6C5Blh2L8dSOFxkPPXAZqmeXix7Zg NMAXfjGfsglPFrhFWNwLI1cV83QrChueaHBpy18HbONRLGu+fB1LpzDiHD6pksMPf9 thttdUqf1zuD/Ad/D+w602Iq/RjKLVg4iwMOW5zI= Date: Tue, 27 Apr 2021 20:18:14 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" Subject: Re: [PATCH 137/190] Revert "net: lio_core: fix two NULL pointer dereferences" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-138-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-138-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 03:00:12PM +0200, Greg Kroah-Hartman wrote: > This reverts commit 41af8b3a097c6fd17a4867efa25966927094f57c. > > 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/cavium/liquidio/lio_core.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c > index 2a0d64e5797c..3532730eb936 100644 > --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c > +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c > @@ -1211,11 +1211,6 @@ int liquidio_change_mtu(struct net_device *netdev, int new_mtu) > > sc = (struct octeon_soft_command *) > octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, 0); > - if (!sc) { > - netif_info(lio, rx_err, lio->netdev, > - "Failed to allocate soft command\n"); > - return -ENOMEM; > - } > > ncmd = (union octnet_cmd *)sc->virtdptr; > > @@ -1689,11 +1684,6 @@ int liquidio_set_fec(struct lio *lio, int on_off) > > sc = octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, > sizeof(struct oct_nic_seapi_resp), 0); > - if (!sc) { > - dev_err(&oct->pci_dev->dev, > - "Failed to allocate soft command\n"); > - return -ENOMEM; > - } > > ncmd = sc->virtdptr; > resp = sc->virtrptr; > -- > 2.31.1 > Original here looks correct, I'll drop my revert. greg k-h