]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
scsi: target: compare full CHAP_A Algorithm strings
authorDavid Disseldorp <ddiss@suse.de>
Thu, 12 Sep 2019 09:55:45 +0000 (11:55 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 04:47:27 +0000 (23:47 -0500)
BugLink: https://bugs.launchpad.net/bugs/1860602
[ Upstream commit 9cef2a7955f2754257a7cddedec16edae7b587d0 ]

RFC 2307 states:

  For CHAP [RFC1994], in the first step, the initiator MUST send:

      CHAP_A=<A1,A2...>

   Where A1,A2... are proposed algorithms, in order of preference.
...
   For the Algorithm, as stated in [RFC1994], one value is required to
   be implemented:

       5     (CHAP with MD5)

LIO currently checks for this value by only comparing a single byte in
the tokenized Algorithm string, which means that any value starting with
a '5' (e.g. "55") is interpreted as "CHAP with MD5". Fix this by
comparing the entire tokenized string.

Reviewed-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
Link: https://lore.kernel.org/r/20190912095547.22427-2-ddiss@suse.de
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/target/iscsi/iscsi_target_auth.c

index e2fa3a3bc81dffff1af904a6b9c612ee37fe2d3a..b6bf605fa5c157bf9abdd6a5c3ed3014820d1314 100644 (file)
@@ -78,7 +78,7 @@ static int chap_check_algorithm(const char *a_str)
                if (!token)
                        goto out;
 
-               if (!strncmp(token, "5", 1)) {
+               if (!strcmp(token, "5")) {
                        pr_debug("Selected MD5 Algorithm\n");
                        kfree(orig);
                        return CHAP_DIGEST_MD5;