From 8695f4eec473400340fccf288c592c38dab92394 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Fri, 16 Sep 2011 08:50:30 -0400 Subject: [PATCH] --- yaml --- r: 264555 b: refs/heads/master c: 8c35ad20270de91d0f3bfe521daa3b7983ee8db7 h: refs/heads/master i: 264553: f18b9b05b57875fea9aa133621f09730ff409a20 264551: bc719f83446738332c311d8af75b12eb9e3c4438 v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_fabric_lib.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 665e112240ad..e8d8c1b1c43b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b3ff6319e2312656fbefe0209bef02d58b6836a +refs/heads/master: 8c35ad20270de91d0f3bfe521daa3b7983ee8db7 diff --git a/trunk/drivers/target/target_core_fabric_lib.c b/trunk/drivers/target/target_core_fabric_lib.c index c4ea3a9a555b..39f021b855ef 100644 --- a/trunk/drivers/target/target_core_fabric_lib.c +++ b/trunk/drivers/target/target_core_fabric_lib.c @@ -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; } /*