Skip to content

Commit eeaf06a

Browse files
Dan Carpentermartinkpetersen
authored andcommitted
scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()"
My patch caused kernel Oopses and delays in boot. Revert it. The problem was that I moved the "mem->dma = paddr;" before the call to be_fill_queue(). But the first thing that the be_fill_queue() function does is memset the whole struct to zero which overwrites the assignment. Link: https://lore.kernel.org/r/X8jXkt6eThjyVP1v@mwanda Fixes: 38b2db5 ("scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs()") Cc: stable <[email protected]> Reported-by: Thomas Lamprecht <[email protected]> Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 2d58649 commit eeaf06a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/scsi/be2iscsi/be_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
30203020
goto create_eq_error;
30213021
}
30223022

3023-
mem->dma = paddr;
30243023
mem->va = eq_vaddress;
30253024
ret = be_fill_queue(eq, phba->params.num_eq_entries,
30263025
sizeof(struct be_eq_entry), eq_vaddress);
@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
30303029
goto create_eq_error;
30313030
}
30323031

3032+
mem->dma = paddr;
30333033
ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,
30343034
BEISCSI_EQ_DELAY_DEF);
30353035
if (ret) {
@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
30863086
goto create_cq_error;
30873087
}
30883088

3089-
mem->dma = paddr;
30903089
ret = be_fill_queue(cq, phba->params.num_cq_entries,
30913090
sizeof(struct sol_cqe), cq_vaddress);
30923091
if (ret) {
@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
30963095
goto create_cq_error;
30973096
}
30983097

3098+
mem->dma = paddr;
30993099
ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,
31003100
false, 0);
31013101
if (ret) {

0 commit comments

Comments
 (0)