p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iSCSI-target: Use common error handling code in iscsi_decode_text_input() 

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Markus Elfring 2017-11-03 22:20:38 +01:00 committed by Nicholas Bellinger
parent 6eaf69e4ec
commit 17c45b9006
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/target/iscsi/iscsi_target_parameters.c
View File

@ -1380,10 +1380,8 @@ int iscsi_decode_text_input(
char *key, *value; char *key, *value;
struct iscsi_param *param; struct iscsi_param *param;
if (iscsi_extract_key_value(start, &key, &value) < 0) { if (iscsi_extract_key_value(start, &key, &value) < 0)
kfree(tmpbuf); goto free_buffer;
return -1;
}
pr_debug("Got key: %s=%s\n", key, value); pr_debug("Got key: %s=%s\n", key, value);
@ -1396,38 +1394,37 @@ int iscsi_decode_text_input(
param = iscsi_check_key(key, phase, sender, param_list); param = iscsi_check_key(key, phase, sender, param_list);
if (!param) { if (!param) {
if (iscsi_add_notunderstood_response(key, if (iscsi_add_notunderstood_response(key, value,
value, param_list) < 0) { param_list) < 0)
kfree(tmpbuf); goto free_buffer;
return -1;
}
start += strlen(key) + strlen(value) + 2; start += strlen(key) + strlen(value) + 2;
continue; continue;
} }
if (iscsi_check_value(param, value) < 0) { if (iscsi_check_value(param, value) < 0)
kfree(tmpbuf); goto free_buffer;
return -1;
}
start += strlen(key) + strlen(value) + 2; start += strlen(key) + strlen(value) + 2;
if (IS_PSTATE_PROPOSER(param)) { if (IS_PSTATE_PROPOSER(param)) {
if (iscsi_check_proposer_state(param, value) < 0) { if (iscsi_check_proposer_state(param, value) < 0)
kfree(tmpbuf); goto free_buffer;
return -1;
}
SET_PSTATE_RESPONSE_GOT(param); SET_PSTATE_RESPONSE_GOT(param);
} else { } else {
if (iscsi_check_acceptor_state(param, value, conn) < 0) { if (iscsi_check_acceptor_state(param, value, conn) < 0)
kfree(tmpbuf); goto free_buffer;
return -1;
}
SET_PSTATE_ACCEPTOR(param); SET_PSTATE_ACCEPTOR(param);
} }
} }
kfree(tmpbuf); kfree(tmpbuf);
return 0; return 0;
free_buffer:
kfree(tmpbuf);
return -1;
} }
int iscsi_encode_text_output( int iscsi_encode_text_output(