From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CBE6C3276C for ; Thu, 2 Jan 2020 22:37:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9E2620863 for ; Thu, 2 Jan 2020 22:37:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004653; bh=C3/V/o5quZsiFkFvPBd0YLWdGQfBoqhIaPTDFQR59vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ee2+wls/Br0iTyyZCxEk0PZwcmgKnd64bUpxNdgta7NuISfR7qDyQCut8Ph3KL7hl D+ljvViHmUGwzTHBHuTymK3VmpVbyIvhcknCoVF2cXM+KM10XY0PEq146b+b+/QMyH NpYoNokNvVpZ3dpEcwtgEie5FQlDAS4ungfJT5CU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731099AbgABWhb (ORCPT ); Thu, 2 Jan 2020 17:37:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:49916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730934AbgABWh0 (ORCPT ); Thu, 2 Jan 2020 17:37:26 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 22F7420863; Thu, 2 Jan 2020 22:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004645; bh=C3/V/o5quZsiFkFvPBd0YLWdGQfBoqhIaPTDFQR59vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkNr4YXuDXpu61ZaDsDAko87UId/A8l+la8Sh8hY3KzRAtVBi0Yht4MMuQMDvLHsz jIvEqIhPxT560yaSjQBMIih4RjeqSCOWPrBO4gYCXof1xSqbv7OCfDa4M+d+NBHJHS M6PopZjsXXCEZLpRGiafJ3+Djp8//9Reqp127ECs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lee Duncan , Mike Christie , David Disseldorp , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.4 094/137] scsi: target: compare full CHAP_A Algorithm strings Date: Thu, 2 Jan 2020 23:07:47 +0100 Message-Id: <20200102220559.535452599@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Disseldorp [ Upstream commit 9cef2a7955f2754257a7cddedec16edae7b587d0 ] RFC 2307 states: For CHAP [RFC1994], in the first step, the initiator MUST send: CHAP_A= 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 Reviewed-by: Mike Christie Signed-off-by: David Disseldorp Link: https://lore.kernel.org/r/20190912095547.22427-2-ddiss@suse.de Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/iscsi/iscsi_target_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c index 3184e023a052..1dd6028eccb9 100644 --- a/drivers/target/iscsi/iscsi_target_auth.c +++ b/drivers/target/iscsi/iscsi_target_auth.c @@ -74,7 +74,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; -- 2.20.1