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

Commit 33395fb8 authored by Roland Dreier's avatar Roland Dreier Committed by Nicholas Bellinger
Browse files

target: Fix 16-bit target ports for SET TARGET PORT GROUPS emulation 



The old code did (MSB << 8) & 0xff, which always evaluates to 0.  Just use
get_unaligned_be16() so we don't have to worry about whether our open-coded
version is correct or not.

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 355b769e

drivers/target/target_core_alua.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/export.h>

#include <linux/export.h>

#include <scsi/scsi.h>

#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_cmnd.h>

#include <asm/unaligned.h>





#include <target/target_core_base.h>

#include <target/target_core_base.h>

#include <target/target_core_backend.h>

#include <target/target_core_backend.h>
@@ -267,8 +268,7 @@ int target_emulate_set_target_port_groups(struct se_task *task) 
		 * changed.

		 * changed.

		 */

		 */

		if (primary) {

		if (primary) {

			tg_pt_id = ((ptr[2] << 8) & 0xff);

			tg_pt_id = get_unaligned_be16(ptr + 2);

			tg_pt_id |= (ptr[3] & 0xff);

			/*

			/*

			 * Locate the matching target port group ID from

			 * Locate the matching target port group ID from

			 * the global tg_pt_gp list

			 * the global tg_pt_gp list
@@ -312,8 +312,7 @@ int target_emulate_set_target_port_groups(struct se_task *task) 
			 * the Target Port in question for the the incoming

			 * the Target Port in question for the the incoming

			 * SET_TARGET_PORT_GROUPS op.

			 * SET_TARGET_PORT_GROUPS op.

			 */

			 */

			rtpi = ((ptr[2] << 8) & 0xff);

			rtpi = get_unaligned_be16(ptr + 2);

			rtpi |= (ptr[3] & 0xff);

			/*

			/*

			 * Locate the matching relative target port identifer

			 * Locate the matching relative target port identifer

			 * for the struct se_device storage object.

			 * for the struct se_device storage object.