From: Colin Ian King Date: Fri, 12 Apr 2019 13:45:12 +0000 (+0100) Subject: vxge: fix return of a free'd memblock on a failed dma mapping X-Git-Tag: v5.1-rc6~21^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a2c34f18c94b596562bf3d019fceab998b8b584;p=thirdparty%2Fkernel%2Flinux.git vxge: fix return of a free'd memblock on a failed dma mapping Currently if a pci dma mapping failure is detected a free'd memblock address is returned rather than a NULL (that indicates an error). Fix this by ensuring NULL is returned on this error case. Addresses-Coverity: ("Use after free") Fixes: 528f727279ae ("vxge: code cleanup and reorganization") Signed-off-by: Colin Ian King Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c index 7cde387e5ec62..51cd57ab3d958 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c @@ -2366,6 +2366,7 @@ static void *__vxge_hw_blockpool_malloc(struct __vxge_hw_device *devh, u32 size, dma_object->addr))) { vxge_os_dma_free(devh->pdev, memblock, &dma_object->acc_handle); + memblock = NULL; goto exit; }