From patchwork Thu Feb 27 13:37:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230361 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 971F0C3567B for ; Thu, 27 Feb 2020 14:21:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6296A2468F for ; Thu, 27 Feb 2020 14:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813275; bh=bJ0SkaoT0tHBLaUk3sTig7xfYiyECBhloF/CD+tvZBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L+xA1LE9/0VAKyfrl2QXjxiIg9oPE3LDpxEcAAVuKZppojgp7zRdGttSHpg2HoBVF XRx0piC6dvU9Iw7MF3CuGyRnW+JcO6MyG+5r2oGw+iR+xeiHrBYlpfDnCTl0U4vBhB eU+zUpRuM1gVfFcuwd/hXh+UZx8JFQ3nboO+JQBQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389680AbgB0ORW (ORCPT ); Thu, 27 Feb 2020 09:17:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:57676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389204AbgB0ORR (ORCPT ); Thu, 27 Feb 2020 09:17:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 638342469D; Thu, 27 Feb 2020 14:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813036; bh=bJ0SkaoT0tHBLaUk3sTig7xfYiyECBhloF/CD+tvZBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0bmWzKhCz+HKipp1vd4nS3T3R7rbLTv67siHF2+fxJgaQ/TKBY+UUOpGWkgk0M5l 1DKCyX6EVwngt7Si8Yjpc8aQSLCurZ3x6cE85FIXlFKzjULWKEwtJOvQsRvOW/y/J0 QaG4tcTsIUFsmstJQjLKSpL+HCzV5PNOFW3InC1s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bruce Allan , Tony Nguyen , Andrew Bowers , Jeff Kirsher Subject: [PATCH 5.5 113/150] ice: Remove possible null dereference Date: Thu, 27 Feb 2020 14:37:30 +0100 Message-Id: <20200227132249.447765879@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Nguyen commit 0a6ea04e3bbd20833d2b49296e5adc1c5bb86386 upstream. Commit 1f45ebe0d8fb ("ice: add extra check for null Rx descriptor") moved the call to ice_construct_skb() under a null check as Coverity reported a possible use of null skb. However, the original call was not deleted, do so now. Fixes: 1f45ebe0d8fb ("ice: add extra check for null Rx descriptor") Reported-by: Bruce Allan Signed-off-by: Tony Nguyen Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -1078,8 +1078,6 @@ construct_skb: skb = ice_build_skb(rx_ring, rx_buf, &xdp); else skb = ice_construct_skb(rx_ring, rx_buf, &xdp); - } else { - skb = ice_construct_skb(rx_ring, rx_buf, &xdp); } /* exit if we failed to retrieve a buffer */ if (!skb) {