Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp381917pxb; Tue, 2 Feb 2021 07:32:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZFFgWJp5CWYcRg2n+LfwidcDo1hCSigW1nMu/l9xXNVxPqN4Spds82H6gmmdUX6utEWyA X-Received: by 2002:a05:6402:60a:: with SMTP id n10mr23632255edv.230.1612279967655; Tue, 02 Feb 2021 07:32:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612279967; cv=none; d=google.com; s=arc-20160816; b=naNfQ6hWdKMSFx/3dPSasxdzeUDWvH5ewyaoCdvgcPR9kHm0q1i1AapDPRIQ6ykNz1 yrVHadDpaSAHRRIsdc8hwYYAmbGCIk9upK5gtURyjw2i3bx5CvlobPyL77Xuf8GA++7J 62Cb6PUn0IlP+Fjeri3IkQKJ/nyallovncn9DsBMLn4TAF+I2HnY0SMTrWAkUNkM/JBL 6FzKLt7pZK/gwhdxKB9VGFcm+pKerVG5PqhaNm4gEkesl4Izi5k+IGzRmVYf6CgFTW6n zbTru7PPeTntphPoFhAZlFh9erZHdNPps3SYWRyUxbLN+cvpYQF1QtXfqIv7gpbc+seT vp3A== 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=b4CcHioi3fBEIR7NTnjW3lBfz4ULwaRAg9mbYA5NRNc=; b=LUt4Pc0OJdZULIHMahZFPXxqL/DqBjnvTlrfUmJlHI71a4J64w7l+Xc6gr403g+7nI q3qOKuEGdK6pQKDswraBBsTbMj2x1RQTgPdFm1nl/6+8z73k87EDHJeXdQzfVNabsdqG zCXvTPYrYA1PTW/wD3AofIT5c8phZaqxCM/4+ATMtVgHnZOd3XILh7p9L/2rWbBuGvfp MAgEBBaAsMvqo2nRQBZ7BxljQHJ1QLK3B9vtaZn3CNKYBVay6U8s9vLu1Tpao6gnvCds JGQjp5RaPTcs2S9teqxi6+yiZlUom8cJmjiAIEOudCtk31coVS7erss0aHY9jU5pzy2X tPJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=u07YUDI3; 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 k8si12544734edx.303.2021.02.02.07.32.23; Tue, 02 Feb 2021 07:32:47 -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=u07YUDI3; 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 S235463AbhBBPaG (ORCPT + 99 others); Tue, 2 Feb 2021 10:30:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:40700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235045AbhBBPQH (ORCPT ); Tue, 2 Feb 2021 10:16:07 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 88BEA64FAC; Tue, 2 Feb 2021 15:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278465; bh=SoteQDSMWgUNiOX4z7Aq5Z9QkB1yzcEbMGEVBDYbOiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u07YUDI3f1QiF1fd5d4APh8+cMbA81gi9PLXBD9PnWx5ah05b1lKoNmT6F9tU2CKb cyA8CxCTH5WHY55NzfE+VDILEGSbCGCfLL28mnbJ0HHFJUx4D+6lSKMMRnuuxhn8bL TxsaIXlVMAL9jV70aJk+BpXcUzECxgrolFtW6N1qQPuxR2uVHpJvzyqcT2ak3J0/kc J11TL+g6fihiTU1K1GVmAMWS3k6tkVh8d3MH14Bbjaw/RUP0D5Iv30lGQhBVyTgOyR Adht3/pRpJUIpDufg0MQLvwVYSZETCmm5+jvv/xkaN9KgvdXxJobCkaKsuMZHPrYOB +gMdckoC5TzxQ== 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 4.9 3/6] iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap Date: Tue, 2 Feb 2021 10:07:37 -0500 Message-Id: <20210202150740.1864854-3-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150740.1864854-1-sashal@kernel.org> References: <20210202150740.1864854-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 174e45d78c46a..ff564198d2cef 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -676,6 +676,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_pcie->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