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

Commit 4e51af9e authored by Dan Carpenter's avatar Dan Carpenter Committed by Martin K. Petersen
Browse files

bfa: fix bfa_fcb_itnim_alloc() error handling 



The caller assumes that "itnim" is NULL on error and non-NULL on success
but really "itnim" is uninitialized on error.  This function should just
use normal error handling where it returns zero on success and negative
on failure.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarAnil Gurumurthy <anil.gurumurthy@qlogic.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 13f30771

drivers/scsi/bfa/bfa_fcs.h

+2 −2
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ bfa_status_t bfa_fcb_rport_alloc(struct bfad_s *bfad, 
/*

 * itnim callbacks

 */

void bfa_fcb_itnim_alloc(struct bfad_s *bfad, struct bfa_fcs_itnim_s **itnim,

int bfa_fcb_itnim_alloc(struct bfad_s *bfad, struct bfa_fcs_itnim_s **itnim,

			struct bfad_itnim_s **itnim_drv);

void bfa_fcb_itnim_free(struct bfad_s *bfad,

			struct bfad_itnim_s *itnim_drv);

drivers/scsi/bfa/bfa_fcs_fcpim.c

+3 −2
Original line number Diff line number Diff line
@@ -588,12 +588,13 @@ bfa_fcs_itnim_create(struct bfa_fcs_rport_s *rport) 
	struct bfa_fcs_lport_s *port = rport->port;

	struct bfa_fcs_itnim_s *itnim;

	struct bfad_itnim_s   *itnim_drv;

	int ret;



	/*

	 * call bfad to allocate the itnim

	 */

	bfa_fcb_itnim_alloc(port->fcs->bfad, &itnim, &itnim_drv);

	if (itnim == NULL) {

	ret = bfa_fcb_itnim_alloc(port->fcs->bfad, &itnim, &itnim_drv);

	if (ret) {

		bfa_trc(port->fcs, rport->pwwn);

		return NULL;

	}

drivers/scsi/bfa/bfad_im.c

+3 −2
Original line number Diff line number Diff line
@@ -440,13 +440,13 @@ bfad_im_slave_destroy(struct scsi_device *sdev) 
 * BFA FCS itnim alloc callback, after successful PRLI

 * Context: Interrupt

 */

void

int

bfa_fcb_itnim_alloc(struct bfad_s *bfad, struct bfa_fcs_itnim_s **itnim,

		    struct bfad_itnim_s **itnim_drv)

{

	*itnim_drv = kzalloc(sizeof(struct bfad_itnim_s), GFP_ATOMIC);

	if (*itnim_drv == NULL)

		return;

		return -ENOMEM;



	(*itnim_drv)->im = bfad->im;

	*itnim = &(*itnim_drv)->fcs_itnim;
@@ -457,6 +457,7 @@ bfa_fcb_itnim_alloc(struct bfad_s *bfad, struct bfa_fcs_itnim_s **itnim, 
	 */

	INIT_WORK(&(*itnim_drv)->itnim_work, bfad_im_itnim_work_handler);

	bfad->bfad_flags |= BFAD_RPORT_ONLINE;

	return 0;

}



/*