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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 14F17C433E2 for ; Wed, 2 Sep 2020 16:20:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D90C0208C7 for ; Wed, 2 Sep 2020 16:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599063608; bh=4ntTsfwJyBJsBW/1yKbNCcQAmv4C8p9X7jLoU6Hnuo8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=fCw+z8NX98VZ6afqkiblPaaqwfFTKDofsdNeaTW+7LP1mrVG+FjioT7qYyBzIOjFv 5sjcbc3Hhy7kwSwEML57RmscRmEbAR/s2VDEcB4df1cZgvkDQ2IJtLfxo6afn5Y4Mm GvhjlYEtwCy0s0jJKgkWrj6zW+weNYleL3su7zSw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728411AbgIBQUF (ORCPT ); Wed, 2 Sep 2020 12:20:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:59466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbgIBQUC (ORCPT ); Wed, 2 Sep 2020 12:20:02 -0400 Received: from embeddedor (187-162-31-110.static.axtel.net [187.162.31.110]) (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 7DA8A208B3; Wed, 2 Sep 2020 16:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599063601; bh=4ntTsfwJyBJsBW/1yKbNCcQAmv4C8p9X7jLoU6Hnuo8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BOY8U3iPghuQxwE3y0jQ6b7QlcoRNKN2TpJ9cBHK4BrUoUSrYP/CDg8RhMJT5gesa ZmRulHjspOaleiQY3Y4wg68/vgrreAn4rcw3Le3vq/SmwL4mJjJR8nSAcuLctYpnM/ ih8hXsRD8z0UI7DGP1ZdwV1Q3ggq4mS2fDt3o7G4= Date: Wed, 2 Sep 2020 11:26:13 -0500 From: "Gustavo A. R. Silva" To: =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= Cc: Magnus Karlsson , Jonathan Lemon , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] xsk: Fix null check on error return path Message-ID: <20200902162613.GB31464@embeddedor> References: <20200902150750.GA7257@embeddedor> <7b3d5e02-852e-189b-7c0e-9f9827fca730@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7b3d5e02-852e-189b-7c0e-9f9827fca730@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Sep 02, 2020 at 05:12:51PM +0200, Björn Töpel wrote: > On 2020-09-02 17:07, Gustavo A. R. Silva wrote: > > Currently, dma_map is being checked, when the right object identifier > > to be null-checked is dma_map->dma_pages, instead. > > > > Fix this by null-checking dma_map->dma_pages. > > > > Addresses-Coverity-ID: 1496811 ("Logically dead code") > > Fixes: 921b68692abb ("xsk: Enable sharing of dma mappings") > > Signed-off-by: Gustavo A. R. Silva > > Nice catch! > > Acked-by: Björn Töpel > Thanks, Björn. -- Gustavo > > --- > > net/xdp/xsk_buff_pool.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c > > index 795d7c81c0ca..5b00bc5707f2 100644 > > --- a/net/xdp/xsk_buff_pool.c > > +++ b/net/xdp/xsk_buff_pool.c > > @@ -287,7 +287,7 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devi > > return NULL; > > dma_map->dma_pages = kvcalloc(nr_pages, sizeof(*dma_map->dma_pages), GFP_KERNEL); > > - if (!dma_map) { > > + if (!dma_map->dma_pages) { > > kfree(dma_map); > > return NULL; > > } > >