* [PATCH][next] xsk: Fix null check on error return path
@ 2020-09-02 15:07 Gustavo A. R. Silva
2020-09-02 15:12 ` Björn Töpel
2020-09-02 18:33 ` Daniel Borkmann
0 siblings, 2 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2020-09-02 15:07 UTC (permalink / raw)
To: Björn Töpel, Magnus Karlsson, Jonathan Lemon,
David S. Miller, Jakub Kicinski, Alexei Starovoitov,
Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend
Cc: netdev, bpf, linux-kernel, Gustavo A. R. Silva
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>
---
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;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH][next] xsk: Fix null check on error return path
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
2020-09-02 16:26 ` Gustavo A. R. Silva
2020-09-02 18:33 ` Daniel Borkmann
1 sibling, 1 reply; 5+ messages in thread
From: Björn Töpel @ 2020-09-02 15:12 UTC (permalink / raw)
To: Gustavo A. R. Silva, Magnus Karlsson, Jonathan Lemon,
David S. Miller, Jakub Kicinski, Alexei Starovoitov,
Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend
Cc: netdev, bpf, linux-kernel
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;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH][next] xsk: Fix null check on error return path
2020-09-02 15:12 ` Björn Töpel
@ 2020-09-02 16:26 ` Gustavo A. R. Silva
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2020-09-02 16:26 UTC (permalink / raw)
To: Björn Töpel
Cc: Magnus Karlsson, Jonathan Lemon, David S. Miller, Jakub Kicinski,
Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
John Fastabend, netdev, bpf, linux-kernel
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 <gustavoars@kernel.org>
>
> Nice catch!
>
> Acked-by: Björn Töpel <bjorn.topel@intel.com>
>
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;
> > }
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] xsk: Fix null check on error return path
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
@ 2020-09-02 18:33 ` Daniel Borkmann
2020-09-02 19:17 ` Gustavo A. R. Silva
1 sibling, 1 reply; 5+ messages in thread
From: Daniel Borkmann @ 2020-09-02 18:33 UTC (permalink / raw)
To: Gustavo A. R. Silva, Björn Töpel, Magnus Karlsson,
Jonathan Lemon, David S. Miller, Jakub Kicinski,
Alexei Starovoitov, Jesper Dangaard Brouer, John Fastabend
Cc: netdev, bpf, linux-kernel
On 9/2/20 5:07 PM, 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>
Applied, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH][next] xsk: Fix null check on error return path
2020-09-02 18:33 ` Daniel Borkmann
@ 2020-09-02 19:17 ` Gustavo A. R. Silva
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2020-09-02 19:17 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Björn Töpel, Magnus Karlsson, Jonathan Lemon,
David S. Miller, Jakub Kicinski, Alexei Starovoitov,
Jesper Dangaard Brouer, John Fastabend, netdev, bpf, linux-kernel
On Wed, Sep 02, 2020 at 08:33:41PM +0200, Daniel Borkmann wrote:
> On 9/2/20 5:07 PM, 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>
>
> Applied, thanks!
Thanks, Daniel. :)
--
Gustavo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-02 19:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).