From: "Björn Töpel" <bjorn.topel@intel.com>
To: "Gustavo A. R. Silva" <gustavoars@kernel.org>,
Magnus Karlsson <magnus.karlsson@intel.com>,
Jonathan Lemon <jonathan.lemon@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>
Cc: 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
Date: Wed, 2 Sep 2020 17:12:51 +0200 [thread overview]
Message-ID: <7b3d5e02-852e-189b-7c0e-9f9827fca730@intel.com> (raw)
In-Reply-To: <20200902150750.GA7257@embeddedor>
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 <gustavoars@kernel.org>
Nice catch!
Acked-by: Björn Töpel <bjorn.topel@intel.com>
> ---
> 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;
> }
>
next prev parent reply other threads:[~2020-09-02 15:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 15:07 [PATCH][next] xsk: Fix null check on error return path Gustavo A. R. Silva
2020-09-02 15:12 ` Björn Töpel [this message]
2020-09-02 16:26 ` Gustavo A. R. Silva
2020-09-02 18:33 ` Daniel Borkmann
2020-09-02 19:17 ` Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7b3d5e02-852e-189b-7c0e-9f9827fca730@intel.com \
--to=bjorn.topel@intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=gustavoars@kernel.org \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox