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

Commit a607a114 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull SCSI target fixes from Nicholas Bellinger:
 "These are mostly minor fixes this time around.  The iscsi-target CHAP
  big-endian bugfix and bump FD_MAX_SECTORS=2048 default patch to allow
  1MB sized I/Os for FILEIO backends on >= v3.5 code are both CC'ed to
  stable.

  Also, there is a persistent reservations regression that has recently
  been reported for >= v3.8.x code, that is currently being tracked down
  for v3.9."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target/pscsi: Reject cross page boundary case in pscsi_map_sg
  target/file: Bump FD_MAX_SECTORS to 2048 to handle 1M sized I/Os
  tcm_vhost: Flush vhost_work in vhost_scsi_flush()
  tcm_vhost: Add missed lock in vhost_scsi_clear_endpoint()
  target: fix possible memory leak in core_tpg_register()
  target/iscsi: Fix mutual CHAP auth on big-endian arches
  target_core_sbc: use noop for SYNCHRONIZE_CACHE
parents 22c3f2ff 8f27d487

drivers/target/iscsi/iscsi_target_auth.c

+4 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static int chap_server_compute_md5( 
{

	char *endptr;

	unsigned long id;

	unsigned char id_as_uchar;

	unsigned char digest[MD5_SIGNATURE_SIZE];

	unsigned char type, response[MD5_SIGNATURE_SIZE * 2 + 2];

	unsigned char identifier[10], *challenge = NULL;
@@ -355,7 +356,9 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, &id, 1);

	/* To handle both endiannesses */

	id_as_uchar = id;

	sg_init_one(&sg, &id_as_uchar, 1);

	ret = crypto_hash_update(&desc, &sg, 1);

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for id\n");

drivers/target/target_core_file.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define FD_DEVICE_QUEUE_DEPTH	32

#define FD_MAX_DEVICE_QUEUE_DEPTH 128

#define FD_BLOCKSIZE		512

#define FD_MAX_SECTORS		1024

#define FD_MAX_SECTORS		2048



#define RRF_EMULATE_CDB		0x01

#define RRF_GOT_LBA		0x02

drivers/target/target_core_pscsi.c

+8 −3
Original line number Diff line number Diff line
@@ -883,7 +883,14 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
		pr_debug("PSCSI: i: %d page: %p len: %d off: %d\n", i,

			page, len, off);



		while (len > 0 && data_len > 0) {

		/*

		 * We only have one page of data in each sg element,

		 * we can not cross a page boundary.

		 */

		if (off + len > PAGE_SIZE)

			goto fail;



		if (len > 0 && data_len > 0) {

			bytes = min_t(unsigned int, len, PAGE_SIZE - off);

			bytes = min(bytes, data_len);
@@ -940,9 +947,7 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
				bio = NULL;

			}



			len -= bytes;

			data_len -= bytes;

			off = 0;

		}

	}

drivers/target/target_core_sbc.c

+5 −2
Original line number Diff line number Diff line
@@ -464,8 +464,11 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops) 
		break;

	case SYNCHRONIZE_CACHE:

	case SYNCHRONIZE_CACHE_16:

		if (!ops->execute_sync_cache)

			return TCM_UNSUPPORTED_SCSI_OPCODE;

		if (!ops->execute_sync_cache) {

			size = 0;

			cmd->execute_cmd = sbc_emulate_noop;

			break;

		}



		/*

		 * Extract LBA and range to be flushed for emulated SYNCHRONIZE_CACHE

drivers/target/target_core_tpg.c

+2 −1
Original line number Diff line number Diff line
@@ -711,7 +711,8 @@ int core_tpg_register( 


	if (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) {

		if (core_tpg_setup_virtual_lun0(se_tpg) < 0) {

			kfree(se_tpg);

			array_free(se_tpg->tpg_lun_list,

				   TRANSPORT_MAX_LUNS_PER_TPG);

			return -ENOMEM;

		}

	}