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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94DDFC43219 for ; Thu, 3 Feb 2022 20:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354750AbiBCUkY (ORCPT ); Thu, 3 Feb 2022 15:40:24 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:39050 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355084AbiBCUhG (ORCPT ); Thu, 3 Feb 2022 15:37:06 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 88526B835BE; Thu, 3 Feb 2022 20:37:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 610A4C340E8; Thu, 3 Feb 2022 20:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920623; bh=M+7Y0vn+BxRton0UAEjJx00c6EcBPBpbms0IRen0pFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CKtd15nMNuRtXDSVw1TpyJbbjhnUrfU7Gl8R+050vLavekGBEiyGR9SSQ/8Op1IY5 VbtW5T86vd9SV85Kprg21aeNZZ5sx9CX5AMhVneZNPRpXspz5C7BaZoIOrUZvj0HsZ 1f9A7JUOCeHQO4kaKXfJNodnTF6nu6sFIeTxjimwje384wLYj1qZ+Kd9TrWzZTDlkm SYM5ejlsvGq2iP8YcN84GMmGPSkCqEqVBDzRjFl/BLqVU9tK5THRSyKOTzcB/uEpdy MMQK+FicRhNRMZ41yKy/0s6cTSE+oye0hTRDO0Hlg+NTB3C9CdD2FB/SLemnwUy0zh 7a4BtWuvhRw6A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ZouMingzhe , Mike Christie , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 6/7] scsi: target: iscsi: Make sure the np under each tpg is unique Date: Thu, 3 Feb 2022 15:36:50 -0500 Message-Id: <20220203203651.5158-6-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203203651.5158-1-sashal@kernel.org> References: <20220203203651.5158-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: ZouMingzhe [ Upstream commit a861790afaa8b6369eee8a88c5d5d73f5799c0c6 ] iscsit_tpg_check_network_portal() has nested for_each loops and is supposed to return true when a match is found. However, the tpg loop will still continue after existing the tpg_np loop. If this tpg_np is not the last the match value will be changed. Break the outer loop after finding a match and make sure the np under each tpg is unique. Link: https://lore.kernel.org/r/20220111054742.19582-1-mingzhe.zou@easystack.cn Signed-off-by: ZouMingzhe Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/iscsi/iscsi_target_tpg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c index 761b065a40bb3..b2a76ecb5789c 100644 --- a/drivers/target/iscsi/iscsi_target_tpg.c +++ b/drivers/target/iscsi/iscsi_target_tpg.c @@ -452,6 +452,9 @@ static bool iscsit_tpg_check_network_portal( break; } spin_unlock(&tpg->tpg_np_lock); + + if (match) + break; } spin_unlock(&tiqn->tiqn_tpg_lock); -- 2.34.1