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

Commit 094bb5d7 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Nicholas Bellinger
Browse files

target-core: don't use "const char*" for a buffer that is written to 



iscsi_parse_pr_out_transport_id launders the const away via a call to
strstr(), and then modifies the buffer (writing a nul byte) through
the return value. It's cleaner to be honest and simply declare the
parameter as "char*", fixing up the call chain, and allowing us to
drop the cast in the return statement.

Amusingly, the two current callers found it necessary to cast a
non-const pointer to a const.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 30a7acd5

drivers/target/target_core_fabric_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int iscsi_get_pr_transport_id_len( 


static char *iscsi_parse_pr_out_transport_id(

	struct se_portal_group *se_tpg,

	const char *buf,

	char *buf,

	u32 *out_tid_len,

	char **port_nexus_ptr)

{
@@ -356,7 +356,7 @@ static char *iscsi_parse_pr_out_transport_id( 
		}

	}



	return (char *)&buf[4];

	return &buf[4];

}



int target_get_pr_transport_id_len(struct se_node_acl *nacl,
@@ -405,7 +405,7 @@ int target_get_pr_transport_id(struct se_node_acl *nacl, 
}



const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,

		const char *buf, u32 *out_tid_len, char **port_nexus_ptr)

		char *buf, u32 *out_tid_len, char **port_nexus_ptr)

{

	u32 offset;

drivers/target/target_core_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int target_get_pr_transport_id(struct se_node_acl *nacl, 
		struct t10_pr_registration *pr_reg, int *format_code,

		unsigned char *buf);

const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,

		const char *buf, u32 *out_tid_len, char **port_nexus_ptr);

		char *buf, u32 *out_tid_len, char **port_nexus_ptr);



/* target_core_hba.c */

struct se_hba *core_alloc_hba(const char *, u32, u32);

drivers/target/target_core_pr.c

+2 −2
Original line number Diff line number Diff line
@@ -1601,7 +1601,7 @@ core_scsi3_decode_spec_i_port( 
			dest_rtpi = tmp_lun->lun_rtpi;



			i_str = target_parse_pr_out_transport_id(tmp_tpg,

					(const char *)ptr, &tid_len, &iport_ptr);

					ptr, &tid_len, &iport_ptr);

			if (!i_str)

				continue;
@@ -3287,7 +3287,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, 
		goto out;

	}

	initiator_str = target_parse_pr_out_transport_id(dest_se_tpg,

			(const char *)&buf[24], &tmp_tid_len, &iport_ptr);

			&buf[24], &tmp_tid_len, &iport_ptr);

	if (!initiator_str) {

		pr_err("SPC-3 PR REGISTER_AND_MOVE: Unable to locate"

			" initiator_str from Transport ID\n");