Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp409576pxb; Tue, 2 Feb 2021 08:09:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgW/2j3pUHDd0JNkih7cqU8Qm/LkrYDVUmANRAh5aYYzH5R0yLzdNnzdJ+Vr2UV4tQkLze X-Received: by 2002:a17:907:f81:: with SMTP id kb1mr16757258ejc.466.1612282195540; Tue, 02 Feb 2021 08:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612282195; cv=none; d=google.com; s=arc-20160816; b=j+SzTtoRmciCp0o+F7vwgCL69GhhdPg2rX0xcYCJbF2Afto3HbUhaoUW/sRpCVC028 8up10oZYiscayIX+Uln9BaARopdOtiJnrD/cppgb4rRFywqQawj6yGVCZPr9hS/68E5A qDfa2IGrl38xU+YExYjcWvY+8fM3PuqIjzjlem1nSsIqxJKt1flrBIGfNe1jpNxw7Qeb lHDsJmHjkhGqkAkSEpWHZYi+IfXvivIsuNzmegfXFEAzZQNYdwIuj3UGS48vjaiofvLU JlsCjEjIVBR4e5KRYc39dDxfcdyiPWfXXrUuRKyH76wrcjm6qZ+GPyALjqXixwOMoXwg sahg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=q6UzxVrD1XLoJbWsdSquTz9M4GUXljERRFve281dzpE=; b=AkQPP0cT55qAXl85jlgq7rioED2OXhSe3POjSPDxN3NATMy2bbrpuzLU/1fiR1lUkE Fix0UWcEIOz9TM2khYNX0M/GQHQXFOVvIf6zFNUb7IIH/IoR6z0+FfawJgPBK8y+F3QO C6JbYnuUsxTCA+TnY/JlFQ2Sil7t7kRYQqyS7fFZcVFZ3jWdf2zZZ+k+OI7gy3zkjyrH TH7nCmKuik9G9PNBufAbqWU7l52uCA+coEdRUy+S1URnZiFMNhQRnvI+BlDDMrfCiC70 xaxl/JCei0ujTTRp1XpWhOuEbR03899D7pRQZu/p5doMn/ehpvFd0ET2Y0AJNq5/4Q97 dE4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TsWY0Gl2; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i8si15660366edj.556.2021.02.02.08.09.30; Tue, 02 Feb 2021 08:09:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TsWY0Gl2; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235938AbhBBQGt (ORCPT + 99 others); Tue, 2 Feb 2021 11:06:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:38282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235156AbhBBPJp (ORCPT ); Tue, 2 Feb 2021 10:09:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 39D4264F65; Tue, 2 Feb 2021 15:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278396; bh=Mntyyw9pDo73Mx8hzXtsDcqsj83PlObc6cNFP+pQy/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TsWY0Gl21G85gdRx1av0D/erLGQJQWy4GbMpKZLZAiegZITdmg09DtZUGBRtpg7dp cOFq1LvjL7V0Wihk7jZKey/pCsyBY0fQovm22wX+E8RuzkKoQ986scgxVDCz4diJzG +nryLltoMbwgmNpItCh5k4eYBcSScURI10H724qJoPz9mrv4gaJ2zZSwSOyQIvZjiQ +k9wBMzjlzGnO33QiWuywHnV6Y44U5Cna02BL3SHJb08QjlJCyucl/fsPliVFDV0/Y NDyfqantD402gIPlCompk7pC+ux45QOOdzRZcyCKVZoF4BELBX6NIpmWesUc8urF/G Qs9ry5i0LnDfA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Emmanuel Grumbach , Luca Coelho , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 15/25] iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap Date: Tue, 2 Feb 2021 10:06:05 -0500 Message-Id: <20210202150615.1864175-15-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150615.1864175-1-sashal@kernel.org> References: <20210202150615.1864175-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-wireless@vger.kernel.org From: Emmanuel Grumbach [ Upstream commit 98c7d21f957b10d9c07a3a60a3a5a8f326a197e5 ] I hit a NULL pointer exception in this function when the init flow went really bad. Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/iwlwifi.20210115130252.2e8da9f2c132.I0234d4b8ddaf70aaa5028a20c863255e05bc1f84@changeid Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c index 966be5689d63a..ed54d04e43964 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -299,6 +299,11 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id) struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_txq *txq = trans->txqs.txq[txq_id]; + if (!txq) { + IWL_ERR(trans, "Trying to free a queue that wasn't allocated?\n"); + return; + } + spin_lock_bh(&txq->lock); while (txq->write_ptr != txq->read_ptr) { IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n", -- 2.27.0