Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bfe5ae5 authored by Lin Yi's avatar Lin Yi Committed by Martin K. Petersen
Browse files

scsi: bnx2fc: fix bnx2fc_cmd refcount imbalance in send_srr 



If cb_arg alloc failed, we can't release the struct orig_io_req refcount
before we take its refcount. As Saurav said, move the srr_err label down
to avoid unnecessary refcount release and nullptr free.

Signed-off-by: default avatarLin Yi <teroincn@163.com>
Acked-by: default avatarSaurav Kashyap <skashyap@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 177709c0

drivers/scsi/bnx2fc/bnx2fc_els.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ int bnx2fc_send_srr(struct bnx2fc_cmd *orig_io_req, u32 offset, u8 r_ctl) 
	rc = bnx2fc_initiate_els(tgt, ELS_SRR, &srr, sizeof(srr),

				 bnx2fc_srr_compl, cb_arg,

				 r_a_tov);

srr_err:

	if (rc) {

		BNX2FC_IO_DBG(orig_io_req, "SRR failed - release\n");

		spin_lock_bh(&tgt->tgt_lock);
@@ -664,6 +663,7 @@ int bnx2fc_send_srr(struct bnx2fc_cmd *orig_io_req, u32 offset, u8 r_ctl) 
	} else

		set_bit(BNX2FC_FLAG_SRR_SENT, &orig_io_req->req_flags);



srr_err:

	return rc;

}