Received: by 2002:a17:90a:9103:0:0:0:0 with SMTP id k3csp11816219pjo; Thu, 2 Jan 2020 14:47:18 -0800 (PST) X-Google-Smtp-Source: APXvYqxznsr030Z6351WJEO/AG5y4q5v+W2tVuvQj8L+zoYM/L+BI5r27EuqTT2jZbr773jjOwZA X-Received: by 2002:a05:6830:12ce:: with SMTP id a14mr57192071otq.366.1578005238426; Thu, 02 Jan 2020 14:47:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578005238; cv=none; d=google.com; s=arc-20160816; b=yroxrDYg1K/B7CIIhn1V0Je42OFN7engsWhuSbBmCyxz8ivLMi9E0bB1/l22dhEcZk cQmzp1/9ZAxBs17R+oxdxIg/PUityGW83oGrbYXwGrxSAjSlxKqV/azmWPiHGrCsrH9v PXvgKdpFcUMreHuhhw2RUO/X9U08PwxO0r/k/KMJJ6gYMqzg+TGH9U93Hzbv+CLu1I3n GzXnB4A5E62pDZreUA98L1OSdKhNVxyxUKZGbs4eS1xlukSlWOUx2OkvYNSo5HpmMkQl 2iX9si0icDuqDDwu2MTRwf8VsQGSEcZm+uB2QfYsNiIf1HGSYxx0SYZ+mD/iTib+cIDI FS+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wrJqFOur7yzwDur47VdnWwIMv8wNDlsGTNK+m9uNqYo=; b=S4+A7F9Ci8jB8Ap3kcb/Gus8PMEpsU3JC0jqG2C/iza3EnRrICi70nOFjYjowVwS9N XGljSPNJqvexphjpbstfqWU5LlPG/jUdErMulUBouWdua79c473IElE1ixpQLOQgPtKK JeKdCW2tB5G/R0wSx8KsjGcqmHzBALDRUn0RthwxNc8WO5VM23crgHZnpr6cbMcBYFW4 GcPkwYexyc4e5TGSFFWkBU1meNFyByOp85VdpC30gs0fOWlqFvdL1HG012FLKNArXLvR SrnUqazgrH4DoJ2qxibtW0l6YApeXirlA8MnS6S/K2sprFotxR2vWpcTxCcnP4shswge 7tLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TDSQIDDi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j13si29504615otq.146.2020.01.02.14.47.06; Thu, 02 Jan 2020 14:47:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TDSQIDDi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730149AbgABWb2 (ORCPT + 99 others); Thu, 2 Jan 2020 17:31:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:36534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730284AbgABWbZ (ORCPT ); Thu, 2 Jan 2020 17:31:25 -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 3CBDE22525; Thu, 2 Jan 2020 22:31:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004284; bh=Dn4bb+91kWSLLy9IAVgEtNkNu7KZvSqnVeXcrvyiIJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TDSQIDDipdsw31ho/rObBAWKUDFEmvHtbid/n8XwesFpqCv0E9D3zPRXZF1lZrE5h fQImMQ492CAIJ1NhhGad9ROTGapOx5XgV1cIc9VCdWovoEuRJqiYDDv8S1tcwbvRv7 +TVGY8tgDLVEvViAH1QDFag8miP/OXP1j9ZiA0IE= 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.9 115/171] scsi: target: compare full CHAP_A Algorithm strings Date: Thu, 2 Jan 2020 23:07:26 +0100 Message-Id: <20200102220603.063448922@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@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 f0d97305575d..aa3f98994c7d 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