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

Commit 4b53662b authored by Abhijeet Joglekar's avatar Abhijeet Joglekar Committed by James Bottomley
Browse files

[SCSI] fnic: Pad the unused bytes of CDB to 0s 



Signed-off-by: default avatarAbhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f9bdc3da

drivers/scsi/fnic/fnic_res.h

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static inline void fnic_queue_wq_copy_desc_icmnd_16(struct vnic_wq_copy *wq, 
						    u64 sgl_addr, u64 sns_addr,

						    u8 crn, u8 pri_ta,

						    u8 flags, u8 *scsi_cdb,

						    u8 cdb_len,

						    u32 data_len, u8 *lun,

						    u32 d_id, u16 mss,

						    u32 ratov, u32 edtov)
@@ -82,7 +83,8 @@ static inline void fnic_queue_wq_copy_desc_icmnd_16(struct vnic_wq_copy *wq, 
	desc->u.icmnd_16.pri_ta = pri_ta; 	/* SCSI Pri & Task attribute */

	desc->u.icmnd_16._resvd1 = 0;           /* reserved: should be 0 */

	desc->u.icmnd_16.flags = flags;         /* command flags */

	memcpy(desc->u.icmnd_16.scsi_cdb, scsi_cdb, CDB_16);    /* SCSI CDB */

	memset(desc->u.icmnd_16.scsi_cdb, 0, CDB_16);

	memcpy(desc->u.icmnd_16.scsi_cdb, scsi_cdb, cdb_len);    /* SCSI CDB */

	desc->u.icmnd_16.data_len = data_len;   /* length of data expected */

	memcpy(desc->u.icmnd_16.lun, lun, LUN_ADDRESS);  /* LUN address */

	desc->u.icmnd_16._resvd2 = 0;          	/* reserved */

drivers/scsi/fnic/fnic_scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic, 
					 0, /* scsi cmd ref, always 0 */

					 pri_tag, /* scsi pri and tag */

					 flags,	/* command flags */

					 sc->cmnd, scsi_bufflen(sc),

					 sc->cmnd, sc->cmd_len,

					 scsi_bufflen(sc),

					 fc_lun.scsi_lun, io_req->port_id,

					 rport->maxframe_size, rp->r_a_tov,

					 rp->e_d_tov);