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

Commit b5fe5e95 authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] libfc: fix fc_tm_done not freeing the allocated fsp pkt 



Frame should be freed in fc_tm_done, this is an updated patch on the one
initially submitted by Hillf Danton.

Signed-off-by: default avatarHillf Danton <dhillf@gmail.com>
Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 3a91090f

drivers/scsi/libfc/fc_fcp.c

+7 −7
Original line number Diff line number Diff line
@@ -1321,27 +1321,27 @@ static void fc_tm_done(struct fc_seq *seq, struct fc_frame *fp, void *arg) 
		 *

		 * scsi-eh will escalate for when either happens.

		 */

		return;

		goto out;

	}



	if (fc_fcp_lock_pkt(fsp))

		return;

		goto out;



	/*

	 * raced with eh timeout handler.

	 */

	if (!fsp->seq_ptr || !fsp->wait_for_comp) {

		spin_unlock_bh(&fsp->scsi_pkt_lock);

		return;

	}

	if (!fsp->seq_ptr || !fsp->wait_for_comp)

		goto out_unlock;



	fh = fc_frame_header_get(fp);

	if (fh->fh_type != FC_TYPE_BLS)

		fc_fcp_resp(fsp, fp);

	fsp->seq_ptr = NULL;

	fsp->lp->tt.exch_done(seq);

	fc_frame_free(fp);

out_unlock:

	fc_fcp_unlock_pkt(fsp);

out:

	fc_frame_free(fp);

}



/**