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

Commit 529f9a76 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Fix to set correct return error codes and misc cleanup. 



- Remove unnecessary if NULL check in function bfa_fcs_vport_free().
- Set correct return error codes in case of memory allocation failure
  in the BSG ELS/CT passthru command handler.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 85d22bbf

drivers/scsi/bfa/bfa_fcs_lport.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -5722,9 +5722,7 @@ bfa_fcs_vport_free(struct bfa_fcs_vport_s *vport) 
	 * The memory for the bfad_vport_s is freed from the FC function

	 * The memory for the bfad_vport_s is freed from the FC function

	 * template vport_delete entry point.

	 * template vport_delete entry point.

	 */

	 */

	if (vport_drv)

	bfad_im_port_delete(vport_drv->drv_port.bfad, &vport_drv->drv_port);

		bfad_im_port_delete(vport_drv->drv_port.bfad,

				&vport_drv->drv_port);

}

}





/*

/*

drivers/scsi/bfa/bfad_bsg.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -3008,12 +3008,15 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) 
	 * buffer of size bsg_data->payload_len

	 * buffer of size bsg_data->payload_len

	 */

	 */

	bsg_fcpt = kzalloc(bsg_data->payload_len, GFP_KERNEL);

	bsg_fcpt = kzalloc(bsg_data->payload_len, GFP_KERNEL);

	if (!bsg_fcpt)

	if (!bsg_fcpt) {

		rc = -ENOMEM;

		goto out;

		goto out;

	}





	if (copy_from_user((uint8_t *)bsg_fcpt, bsg_data->payload,

	if (copy_from_user((uint8_t *)bsg_fcpt, bsg_data->payload,

				bsg_data->payload_len)) {

				bsg_data->payload_len)) {

		kfree(bsg_fcpt);

		kfree(bsg_fcpt);

		rc = -EIO;

		goto out;

		goto out;

	}

	}