xsk: Fix null check on error return path
Subsystems (4)
Quoted 8 lines · Gustavo A. R. Silva
Currently,
dma_mapis being checked, when the right object identifier to be null-checked isdma_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 <[email protected]>
Nice catch!
Quoted 18 lines
--- net/xdp/xsk_buff_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/xdp/xsk_buff_pool.c +1
-1@@ -287,7 +287,7 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devireturn 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 ; }
PATCH 1/1 xsk: Fix null check on error return path
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")
--- net/xdp/xsk_buff_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xdp/xsk_buff_pool.c +1 -1
@@ -287,7 +287,7 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devireturn 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 ; }
Signature · 1 line
2.27.0
Quoted 6 lines · Björn Töpel
Quoted 5 lines · Gustavo A. R. Silva
Currently,
dma_mapis being checked, when the right object identifier to be null-checked isdma_map->dma_pages, instead.Fix this by null-checking
dma_map->dma_pages.
Quoted 8 lines
Quoted 3 lines
Addresses-Coverity-ID: 1496811 ("Logically dead code")
Fixes 921b68692abb ("xsk: Enable sharing of dma mappings")Signed-off-by Gustavo A. R. Silva <[email protected]>Nice catch!
Acked-by Björn Töpel <[email protected]>
Thanks, Björn.
--
Gustavo
Quoted 17 lines
Quoted 17 lines
--- net/xdp/xsk_buff_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/xdp/xsk_buff_pool.c +1
-1@@ -287,7 +287,7 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devireturn 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 ; }
Quoted 8 lines · Gustavo A. R. Silva
Currently,
dma_mapis being checked, when the right object identifier to be null-checked isdma_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 <[email protected]>
Applied, thanks!
Quoted 11 lines · Daniel Borkmann
Quoted 8 lines · Gustavo A. R. Silva
Currently,
dma_mapis being checked, when the right object identifier to be null-checked isdma_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 <[email protected]>Applied, thanks!
Thanks, Daniel. :)
--
Gustavo