diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-06-13 00:05:16 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-06-26 23:56:42 -0400 |
commit | b06eef6eab8e4a241f88385527ac4d1844abc18d (patch) | |
tree | b1f3ac91024dba8446faf19cd3ca66238fd82155 | |
parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) |
iscsi-target: Convert chap_server_compute_md5 to use kstrtoul
This patch converts chap_server_compute_md5() from simple_strtoul() to
kstrtoul usage().
This addresses the case where a empty 'CHAP_I=' key value received during
mutual authentication would be converted to a '0' by simple_strtoul(),
instead of failing the login attempt.
Reported-by: Tejas Vaykole <tejas.vaykole@calsoftinc.com>
Tested-by: Tejas Vaykole <tejas.vaykole@calsoftinc.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/iscsi/iscsi_target_auth.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c index 19b842c3e0b3..9430eea7c0d6 100644 --- a/drivers/target/iscsi/iscsi_target_auth.c +++ b/drivers/target/iscsi/iscsi_target_auth.c | |||
@@ -174,7 +174,6 @@ static int chap_server_compute_md5( | |||
174 | char *nr_out_ptr, | 174 | char *nr_out_ptr, |
175 | unsigned int *nr_out_len) | 175 | unsigned int *nr_out_len) |
176 | { | 176 | { |
177 | char *endptr; | ||
178 | unsigned long id; | 177 | unsigned long id; |
179 | unsigned char id_as_uchar; | 178 | unsigned char id_as_uchar; |
180 | unsigned char digest[MD5_SIGNATURE_SIZE]; | 179 | unsigned char digest[MD5_SIGNATURE_SIZE]; |
@@ -320,9 +319,14 @@ static int chap_server_compute_md5( | |||
320 | } | 319 | } |
321 | 320 | ||
322 | if (type == HEX) | 321 | if (type == HEX) |
323 | id = simple_strtoul(&identifier[2], &endptr, 0); | 322 | ret = kstrtoul(&identifier[2], 0, &id); |
324 | else | 323 | else |
325 | id = simple_strtoul(identifier, &endptr, 0); | 324 | ret = kstrtoul(identifier, 0, &id); |
325 | |||
326 | if (ret < 0) { | ||
327 | pr_err("kstrtoul() failed for CHAP identifier: %d\n", ret); | ||
328 | goto out; | ||
329 | } | ||
326 | if (id > 255) { | 330 | if (id > 255) { |
327 | pr_err("chap identifier: %lu greater than 255\n", id); | 331 | pr_err("chap identifier: %lu greater than 255\n", id); |
328 | goto out; | 332 | goto out; |