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

Commit 8c35ad20 authored by Mimi Zohar's avatar Mimi Zohar
Browse files

target: check hex2bin result



Now that hex2bin does error checking, on error add debugging error msg.

Changelog v1 (update):
- fixed definition of 'ret'
- hex2bin now returns an int

Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent 2b3ff631
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ u32 sas_get_pr_transport_id(
	unsigned char *buf)
{
	unsigned char *ptr;
	int ret;

	/*
	 * Set PROTOCOL IDENTIFIER to 6h for SAS
@@ -74,7 +75,9 @@ u32 sas_get_pr_transport_id(
	 */
	ptr = &se_nacl->initiatorname[4]; /* Skip over 'naa. prefix */

	hex2bin(&buf[4], ptr, 8);
	ret = hex2bin(&buf[4], ptr, 8);
	if (ret < 0)
		pr_debug("sas transport_id: invalid hex string\n");

	/*
	 * The SAS Transport ID is a hardcoded 24-byte length
@@ -156,8 +159,9 @@ u32 fc_get_pr_transport_id(
	unsigned char *buf)
{
	unsigned char *ptr;
	int i;
	int i, ret;
	u32 off = 8;

	/*
	 * PROTOCOL IDENTIFIER is 0h for FCP-2
	 *
@@ -174,7 +178,9 @@ u32 fc_get_pr_transport_id(
			i++;
			continue;
		}
		hex2bin(&buf[off++], &ptr[i], 1);
		ret = hex2bin(&buf[off++], &ptr[i], 1);
		if (ret < 0)
			pr_debug("fc transport_id: invalid hex string\n");
		i += 2;
	}
	/*