Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp387074pxb; Tue, 2 Feb 2021 07:39:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3bwQj2kyPW8vtSbIdNjDgB+YBAroJSUmlHgwQQxVPRKnv6wWYkOjfcqWbgixo5BT03GKS X-Received: by 2002:a17:906:cc5d:: with SMTP id mm29mr6665835ejb.183.1612280382480; Tue, 02 Feb 2021 07:39:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612280382; cv=none; d=google.com; s=arc-20160816; b=apgVJKFTNebEW3iygkHmVtx1llPhbzvCXFjqyrQOy94olheWoC/qX6G2xl0neErw3K n/zkw9xNwBXlYO+SruijdzBinDKj9dm+J1Ocy8LVq5Pd92hgmSmC5jjX58IY0EK2q3uT cHWnw3rjQ209fYTtv9YYFtUhY4sMtuh1sfyehTdkLF9SHB7gjFkeSA34F12U9zI93+Uq 0lzzoWCi4pLOJmnE5jn+CircfvqUo5yEKbgqk1umZoDAY5oLAJP3Rbk51UQ01NTgR6W0 n4yb2INAf0Kh1eUoZ8HOwp2+Xfd7BtnWtUjdSf0T3g4OIcMpvMc8jt2KhvTWo9k+ky4u j11Q== 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=JFk/fC4yAsyZu2FubIJh+P8lkvZiAKE37C4eX7wK/Qw=; b=LKlMFwnUzDat3HHvVGWM56rWYt7oabMwKE9pQLxtoBMmIBs+Yu4xJIjvB3u0XKeM8i Zpr6JQcu07O39uvNETZHU1Wo97ovs8W2ZnS0zwFWGyfSgFNVsfyEAz8NcgVeekixJw3J gYuVbETKGW4u4cEQF0FRI1UycHKRk9SBtyU8aa/ulu+p97Zm38IMyMx24CNeVCHid1TX H0BRwgXNHr0XfaVvrP8LL2iKsHzsR4LPEVRcfulBRSIke+TOj/BBKalxWva1+CyiZVp0 pqure1pKhbgsRlyF9SAhkxiZ9zUgq82cCt/qUI+ChNu9LrxWV0WXs90PU1QakdzbyVWQ o4tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RZorzR1U; 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 b22si13211938eds.249.2021.02.02.07.39.18; Tue, 02 Feb 2021 07:39:42 -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=RZorzR1U; 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 S235611AbhBBPho (ORCPT + 99 others); Tue, 2 Feb 2021 10:37:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:40430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235282AbhBBPPe (ORCPT ); Tue, 2 Feb 2021 10:15:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E040A64F9E; Tue, 2 Feb 2021 15:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278455; bh=URee8Yn0JaFrFfh24A299t9bK1e6ZhAAFklE4uFM7Bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RZorzR1UH7qh4zk8jMfQKPyznRIMA+RHnQWc085hX9MoqICGr3MNAfuqikEmvrVrg Pepzjzjw9nevJhSfitsvOYWa1Vo/AVPhbUWwAoeuCBellN/jA+BQY4Q5cAGyfO/Zbf rciDkMAxHwjvqE+cVb/Ixo2LYSwoyDXkO+0R9N8kj2zu3E1bg660lI7GquHttn2vv2 kBdnFxohHGIpORwzpqohnR0Iwjd8Q/5c+2h9xsDFkUY/sLxkW4oRdYo2Ec4EV9W59A Ju+468Uq1bepwsbgKQNLXAVBiDN2Ssk8LUmBR6VfeHDhDacnIk1H2DfpOD01LuG2XU D02uaHVXNAssg== 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.14 4/7] iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap Date: Tue, 2 Feb 2021 10:07:26 -0500 Message-Id: <20210202150730.1864745-4-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150730.1864745-1-sashal@kernel.org> References: <20210202150730.1864745-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 c3a2e6b6da65b..e1fb0258c9168 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -622,6 +622,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