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 F2918C433FE for ; Thu, 3 Feb 2022 20:43:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355570AbiBCUnS (ORCPT ); Thu, 3 Feb 2022 15:43:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355657AbiBCUkj (ORCPT ); Thu, 3 Feb 2022 15:40:39 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3183C0619C6; Thu, 3 Feb 2022 12:36:47 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 84CE960C70; Thu, 3 Feb 2022 20:36:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CFA7C36AE2; Thu, 3 Feb 2022 20:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920607; bh=sRCeHRUcEVzofXBICCRpX95loDW+YUQQzIAVjutA1HM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hNbjxonrKRAfS/bChs26hwSsC3ttEuAablgJnqP2Q7s0aji3GOLyA9QFG1NJPooqy kVKiNrEJq3rIZTKPBFHvyWHDUYjV8AlS/rMTTEEwKBsMh4xpjm9fNKGNneTK2hJ0Cf omZjRMSJq8mOdFiSzzoB5pMizLaU+aXlEuXvC58Q4fgElCc0fuyTa6AQ3jcWLHpB2w +hMXrNhdAEc9NLwTias6bP4D1G4wwmgbeBTbiFJbD9e/T0jvMydnblmWjniFzScEI8 axtTPxPmLT06Hp6PbQgKyifGP1gx2rYbrZ/Tio9AVftN+CjR2FYXbArLf2kP4Hgi46 9QYRios9oQb7A== 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.14 7/9] scsi: target: iscsi: Make sure the np under each tpg is unique Date: Thu, 3 Feb 2022 15:36:31 -0500 Message-Id: <20220203203633.4685-7-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203203633.4685-1-sashal@kernel.org> References: <20220203203633.4685-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 16e7516052a44..2b78843091a2e 100644 --- a/drivers/target/iscsi/iscsi_target_tpg.c +++ b/drivers/target/iscsi/iscsi_target_tpg.c @@ -448,6 +448,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