scsi: be2iscsi: Fix a possible null-pointer dereference in beiscsi_alloc_mem()
Subsystems (2)
PATCH 1/1 scsi: be2iscsi: Fix a possible null-pointer dereference in beiscsi_alloc_mem()
There appears to be a potential null-pointer dereference in the error-handling path. Consider the following scenario:
1. One or more mem_descr->mem_array objects have been allocated successfully, so i is non-zero.
2. In the i-th iteration, DMA memory allocation succeeds, resulting in a non-zero j.
3. A subsequent kmalloc_array() call fails, leaving mem_descr->mem_array as NULL and transferring control to the free_mem label.
Under these conditions, the cleanup code may dereference mem_descr->mem_array while freeing DMA memory, as shown below:
dma_free_coherent(&phba->pcidev->dev,
mem_descr->mem_array[j - 1].size, mem_descr->mem_array[j - 1]. virtual_address, (unsigned long)mem_descr-> mem_array[j - 1]. bus_address.u.a64.address);
To reduce the risk of such a null-pointer dereference, it may be preferable to separate the cleanup of resources associated with a failed mem_descr->mem_array allocation from the cleanup of previously initialized descriptors. Likewise, DMA memory allocated prior to a failed mem_arr->virtual_address allocation could be released independently, rather than being handled by the shared while loop under the free_mem label.
--- drivers/scsi/be2iscsi/be_main.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/scsi/be2iscsi/be_main.c +13 -7
@@ -2554,8 +2554,18 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba)kfree (mem_arr_orig);return 0 ; free_mem: - mem_descr->num_elements = j; -while ((i) || (j)) { +while (j) { + j--; + mem_arr--; +dma_free_coherent (&phba->pcidev->dev, + mem_arr->size, + mem_arr->virtual_address, + (unsigned long )mem_arr-> + bus_address.u.a64.address); + } +while (i) { + i--; + mem_descr--;for (j = mem_descr->num_elements; j >0 ; j--) { dma_free_coherent(&phba->pcidev->dev, mem_descr->mem_array[j - 1].size,
@@ -2565,11 +2575,7 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) mem_array[j -1 ]. bus_address.u.a64.address); } -if (i) { - i--; -kfree (mem_descr->mem_array); - mem_descr--; - } +kfree (mem_descr->mem_array); }kfree (mem_arr_orig);kfree (phba->init_mem);
Signature · 1 line
2.43.0