summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2014-06-05 18:08:57 -0700
committerJiri Slaby <jslaby@suse.cz>2014-06-23 10:27:53 +0200
commit4eed5cf5e6d06f1ef7d786ed3f43da55112cb96c (patch)
tree149dfa4aa904a0dc8ac04ae9a512e95b57ee73f0
parentba576fd015636729ae6c55bd96f56014c2526571 (diff)
downloadlinux-stable-4eed5cf5e6d06f1ef7d786ed3f43da55112cb96c.tar.gz
linux-stable-4eed5cf5e6d06f1ef7d786ed3f43da55112cb96c.tar.bz2
linux-stable-4eed5cf5e6d06f1ef7d786ed3f43da55112cb96c.zip
iscsi-target: Reject mutual authentication with reflected CHAP_C
commit 1d2b60a5545942b1376cb48c1d55843d71e3a08f upstream. This patch adds an explicit check in chap_server_compute_md5() to ensure the CHAP_C value received from the initiator during mutual authentication does not match the original CHAP_C provided by the target. This is in line with RFC-3720, section 8.2.1: Originators MUST NOT reuse the CHAP challenge sent by the Responder for the other direction of a bidirectional authentication. Responders MUST check for this condition and close the iSCSI TCP connection if it occurs. Reported-by: Tejas Vaykole <tejas.vaykole@calsoftinc.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/target/iscsi/iscsi_target_auth.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
index 3e80188558cd..b25bba5f26b2 100644
--- a/drivers/target/iscsi/iscsi_target_auth.c
+++ b/drivers/target/iscsi/iscsi_target_auth.c
@@ -314,6 +314,16 @@ static int chap_server_compute_md5(
goto out;
}
/*
+ * During mutual authentication, the CHAP_C generated by the
+ * initiator must not match the original CHAP_C generated by
+ * the target.
+ */
+ if (!memcmp(challenge_binhex, chap->challenge, CHAP_CHALLENGE_LENGTH)) {
+ pr_err("initiator CHAP_C matches target CHAP_C, failing"
+ " login attempt\n");
+ goto out;
+ }
+ /*
* Generate CHAP_N and CHAP_R for mutual authentication.
*/
tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);