X-Received: by 2002:a17:90a:a02:b0:1bc:71a6:87ad with SMTP id o2-20020a17090a0a0200b001bc71a687admr1590069pjo.15.1645506934722; Mon, 21 Feb 2022 21:15:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645506934; cv=none; d=google.com; s=arc-20160816; b=HwDf5683fsVi5KPRe4wtPMFvmKP3bjwX4Ffz0jjI3Tlfia1HBHloOiV7CbQFgry+Ee bhWz3UujM7us/BC8gBnQReI5p/24y61FRlsbFTfESOo0qKzq3+kWL+WntM3OyUeUwtqR mXPxgqMf0+wHIM8l0nR3H7Ep73Q2rd/XKYDW82Z0H9RDNvJRqY6QszUyGO5Ojk6kEojW KaHPS+KDfUBu2A9NE31ibX+Skeekqkf3AnFZca7RHTvaC+k+9uN05388EOt67sf2Nczm fWoVeOo9zck9qINDv+V42+qdFqXY5jMNimuYkjxS4rMfGWPJhZdJrbi0P2q6BTSbmc3P 8XhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T5MjtlfNiMka+c7QqiMqDnleh0Gxd/1LSZNah/C3s7s=; b=CwpbNdjnnCeKHP89W0AA0hgnRcnN5/z30YVnhJD4WzSuWXNNmtqZkl03y1s7ycFZBJ Zmnn0qp+uTYJsgLCJSEVDVFgSfi7iXPuSqhZh0MVQbkZXqqPL0xH5uLPxk13cvS5uS57 LZ9fRxz8k9GSFE8gKaV5G3lkYUdut8MPeLWo1OL16P1ghI8e2xgKV2BjgiI5284nDiLl o+qg/ednhgTpFgzvZsDescQ1WN7+vXJ6npdAVrNh0OyvBjGO6Ft9aQVHvStObhVL5KMC fJ/1muOZ3m/R0dRm6UF2bVGyDDE5slDgnz6T2XX8WwhtGyf2LegCLSs4oZez7GLJPcOs 1LVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QTwVUeb2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id mt4si1074359pjb.7.2022.02.21.21.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 21:15:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QTwVUeb2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1A7EFE6C15; Mon, 21 Feb 2022 20:47:40 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350509AbiBUJdW (ORCPT + 99 others); Mon, 21 Feb 2022 04:33:22 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:48082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349342AbiBUJZv (ORCPT ); Mon, 21 Feb 2022 04:25:51 -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 2205B3980C; Mon, 21 Feb 2022 01:10:35 -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 0393C60B23; Mon, 21 Feb 2022 09:10:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0B64C340E9; Mon, 21 Feb 2022 09:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645434634; bh=hNhPJezUobuokOl8E7Mv7fUlIfIxunULPG2WNnzVhXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QTwVUeb2E0JKc6DlQYjDTGjKhjW1Rsx0NB4ViOVokUfh9lO1tBmWIbjc3mA6MI619 Ywp+NpjBYM+1ZubWzpJWQPlKvNPEtKrPrTWkk+Y+R88nXi25tXMXbKtjv3RkwgwURf SCG1LZhfweLurrtKdIY6+lH/KoiNvCTfO3YxuSjI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Luca Coelho , Kalle Valo Subject: [PATCH 5.15 075/196] iwlwifi: pcie: gen2: fix locking when "HW not ready" Date: Mon, 21 Feb 2022 09:48:27 +0100 Message-Id: <20220221084933.446409056@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084930.872957717@linuxfoundation.org> References: <20220221084930.872957717@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg commit 4c29c1e27a1e178a219b3877d055e6dd643bdfda upstream. If we run into this error path, we shouldn't unlock the mutex since it's not locked since. Fix this in the gen2 code as well. Fixes: eda50cde58de ("iwlwifi: pcie: add context information support") Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/iwlwifi.20220128142706.b8b0dfce16ef.Ie20f0f7b23e5911350a2766524300d2915e7b677@changeid Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c @@ -408,8 +408,7 @@ int iwl_trans_pcie_gen2_start_fw(struct /* This may fail if AMT took ownership of the device */ if (iwl_pcie_prepare_card_hw(trans)) { IWL_WARN(trans, "Exit HW not ready\n"); - ret = -EIO; - goto out; + return -EIO; } iwl_enable_rfkill_int(trans);