Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp3965376pxb; Mon, 21 Feb 2022 09:12:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJziICeiKFUTTkACOnZHQu8XW34zPpatgmmcWqCrm3LkNQNWvkVirpGDd6YcPo62sh1X9nvA X-Received: by 2002:a17:902:6b04:b0:14f:2cc0:fa98 with SMTP id o4-20020a1709026b0400b0014f2cc0fa98mr20025845plk.44.1645463561164; Mon, 21 Feb 2022 09:12:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645463561; cv=none; d=google.com; s=arc-20160816; b=y/eTq+a7U5/GkWZ/krIo3i0a9rkMYqx56s9J7Z3qapv9gNkw7wdXHDIJMhS21uUswo 870IlK3eHPCxG1MQ8iNyFcbJEDKM+WKJXgvXLEJh2zqgX/Z4rZzcBRQy02C1NpmfJXIi SIGd7ay/0ypKwT//bzu6ln24NgxPQ33zyF5h6jsn7bJbLUh/O8lcWEJIy+fzR8aEEwsu uqSTaE92R5l49XpH3wi8y5Uk2Fx8Wqu5iucy2xTmnkW3KD0sX02SSO7RQK5CnZ8cJT1Q Wx4pUf64OSo58p/GHmE5AvO0Wg2A1ldAtEdBwnJsM+C0fHl26tBTL3+gKvsaw8lbvqLj R0lw== 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=xAtutjRnN8Z2/oRkJGVdW6yMYRPbaVaUJ4OCJLhO+Ek=; b=X/88+dTvbxpeMY51XfUyFhhT/tzZcFvq4YeKyN2x9I9U/MgLpg4bPHMs4nqAHyzTOw lDhyeQU3JwURcQ0Fr+D3fq3RuFq5FL17dC0BLP1QCvpT0rYRcQSrc6rBVpNDB2xw21HU wzGdTYVrD0mVP7gKTswigijRjshfiRymJK5Fn0YsNDopoRkBfEfrTUKW695TbEPqtTlK 6jvFOS+9GrCbtqO3JiAiKpd9uDHNUgoCJdgmu2uBDu43Z/ODdBM6H4uhTXv19EsWiYP0 UbAKUe+ajbxQcMtmwbqwkaJYzX2/w49yegvFkfogVv+VrBiR8Npku1XqO7gfJrDMfBIb 3c8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sBgTiXg9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gc1si1974527pjb.130.2022.02.21.09.12.24; Mon, 21 Feb 2022 09:12:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sBgTiXg9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347881AbiBUJJj (ORCPT + 99 others); Mon, 21 Feb 2022 04:09:39 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:48328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234441AbiBUJFh (ORCPT ); Mon, 21 Feb 2022 04:05:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706F025C7A; Mon, 21 Feb 2022 00:59:02 -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 0D11461132; Mon, 21 Feb 2022 08:59:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E86C0C340F1; Mon, 21 Feb 2022 08:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433941; bh=wVBKcepK6ofvfIi4wuqL8gC+94QFVq/5PWNf8Z/HNFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sBgTiXg9k8eZo+pzcHrnZQr27lj3xKx62d1lIhBW0r3zYaYEZ2m4htWGx++eTZgDf vQph05mmfSpB3hPlJeDxaA+YW529NoxrPQGwkl2YAa33x3yTZfPhtwk2In90D+kPbe Py3/mCrWZL1BcNMgksvg2oR4DKto7Ip0tNJs74Qc= 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.4 37/80] iwlwifi: pcie: gen2: fix locking when "HW not ready" Date: Mon, 21 Feb 2022 09:49:17 +0100 Message-Id: <20220221084916.785633438@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084915.554151737@linuxfoundation.org> References: <20220221084915.554151737@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=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 @@ -292,8 +292,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);