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

Commit ba539743 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Fix MAINTENANCE_IN service action CDB checks to use lower 5 bits 



This patch fixes the MAINTENANCE_IN service action type checks to only
look at the proper lower 5 bits of cdb byte 1.  This addresses the case
where MI_REPORT_TARGET_PGS w/ extended header using the upper three bits of
cdb byte 1 was not processed correctly in transport_generic_cmd_sequencer,
as well as the three cases for standby, unavailable, and transition ALUA
primary access state checks.

Also add MAINTENANCE_IN to the excluded list in transport_generic_prepare_cdb()
to prevent the PARAMETER DATA FORMAT bits from being cleared.

Cc: Hannes Reinecke <hare@suse.de>
Cc: Rob Evers <revers@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 66246617

drivers/target/target_core_alua.c

+3 −3
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static inline int core_alua_state_standby( 
	case RECEIVE_DIAGNOSTIC:

	case SEND_DIAGNOSTIC:

	case MAINTENANCE_IN:

		switch (cdb[1]) {

		switch (cdb[1] & 0x1f) {

		case MI_REPORT_TARGET_PGS:

			return 0;

		default:
@@ -429,7 +429,7 @@ static inline int core_alua_state_unavailable( 
	case INQUIRY:

	case REPORT_LUNS:

	case MAINTENANCE_IN:

		switch (cdb[1]) {

		switch (cdb[1] & 0x1f) {

		case MI_REPORT_TARGET_PGS:

			return 0;

		default:
@@ -469,7 +469,7 @@ static inline int core_alua_state_transition( 
	case INQUIRY:

	case REPORT_LUNS:

	case MAINTENANCE_IN:

		switch (cdb[1]) {

		switch (cdb[1] & 0x1f) {

		case MI_REPORT_TARGET_PGS:

			return 0;

		default:

drivers/target/target_core_transport.c

+2 −1
Original line number Diff line number Diff line
@@ -1329,6 +1329,7 @@ static inline void transport_generic_prepare_cdb( 
	case VERIFY_16: /* SBC - VRProtect */

	case WRITE_VERIFY: /* SBC - VRProtect */

	case WRITE_VERIFY_12: /* SBC - VRProtect */

	case MAINTENANCE_IN: /* SPC - Parameter Data Format for SA RTPG */

		break;

	default:

		cdb[1] &= 0x1f; /* clear logical unit number */
@@ -2597,7 +2598,7 @@ static int transport_generic_cmd_sequencer( 
			/*

			 * Check for emulated MI_REPORT_TARGET_PGS.

			 */

			if (cdb[1] == MI_REPORT_TARGET_PGS &&

			if ((cdb[1] & 0x1f) == MI_REPORT_TARGET_PGS &&

			    su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) {

				cmd->execute_cmd =

					target_emulate_report_target_port_groups;