warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix CHAP authentication

Browse Source 
Empty discovery and login packets are legal, and have the same behavior
as packets with a single NUL in them.  Introduced by commit 94d73fc
(Merge pull request #83 from bonzini/coverity, 2013-11-05).

Reported-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2013-12-12 17:04:55 +01:00
parent 78e49f1427
commit 34b93c4cfd
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/discovery.c
+2 -9
View File
@@ -118,15 +118,8 @@ iscsi_process_text_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
pdu->private_data); pdu->private_data);
return -1; return -1;
} }
if (size == 0) {
iscsi_set_error(iscsi, "size == 0 when parsing "
"discovery data");
pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
pdu->private_data);
return -1;
}
do { while (size > 0) {
unsigned char *end; unsigned char *end;
int len; int len;
@@ -204,7 +197,7 @@ iscsi_process_text_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
ptr += len + 1; ptr += len + 1;
size -= len + 1; size -= len + 1;
} while (size > 0); }
pdu->callback(iscsi, SCSI_STATUS_GOOD, targets, pdu->private_data); pdu->callback(iscsi, SCSI_STATUS_GOOD, targets, pdu->private_data);
iscsi_free_discovery_addresses(iscsi, targets); iscsi_free_discovery_addresses(iscsi, targets);
lib/login.c
+2 -10
View File
@@ -982,21 +982,13 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
iscsi->expcmdsn = expcmdsn; iscsi->expcmdsn = expcmdsn;
} }
if (size == 0) {
iscsi_set_error(iscsi, "size == 0 when parsing "
"login data");
pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
pdu->private_data);
return -1;
}
/* XXX here we should parse the data returned in case the target /* XXX here we should parse the data returned in case the target
* renegotiated some some parameters. * renegotiated some some parameters.
* we should also do proper handshaking if the target is not yet * we should also do proper handshaking if the target is not yet
* prepared to transition to the next stage * prepared to transition to the next stage
*/ */
do { while (size > 0) {
char *end; char *end;
int len; int len;
@@ -1087,7 +1079,7 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
ptr += len + 1; ptr += len + 1;
size -= len + 1; size -= len + 1;
} while (size > 0); }
if (status == SCSI_STATUS_REDIRECT && iscsi->target_address[0]) { if (status == SCSI_STATUS_REDIRECT && iscsi->target_address[0]) {
ISCSI_LOG(iscsi, 2, "target requests redirect to %s",iscsi->target_address); ISCSI_LOG(iscsi, 2, "target requests redirect to %s",iscsi->target_address);