From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFE833BBF2; Mon, 14 Oct 2024 15:00:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918026; cv=none; b=mvRj2drr5rQkglQd2maTNi5anTxRSxhzBRXrc09U5vw08gFyw55sHkNc20GuwG3EpvACKf2M18nWEEWDck07ION5+vEHOUb7g5CfkoFcFxsg8J/1Qk1SgtsPkjbnrPaVyseajd1/OsO1rCZ8aRVW0Q+wKoeBFmKBEHu8PAY42qM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918026; c=relaxed/simple; bh=A5Mg2rvGRwwEbnm32HALunPNavc57Vv6wzfFGatGPu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ABO4fEfp7bmiU7tSsuU0v5DvfxKKnKahzgRc2sQu3kbwn7c5KGSubx0DGv5GSj3vj70eSBn6hVFW6Dn2Kb4XkZjeVxIiYC4UAVAzD6NgvlOy+37sy7/MngkXJVA4zzZBjcAktG/YDhWE5QIY4/KRG8GUazdElb7DxI0lQjlepe4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y1OAznUL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y1OAznUL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36B7FC4CEC7; Mon, 14 Oct 2024 15:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728918025; bh=A5Mg2rvGRwwEbnm32HALunPNavc57Vv6wzfFGatGPu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y1OAznULHr+aG/jfcSWuNBi3vchllFCp5svCRV0OM4OrZWpT9CNgL3DnYlZRAD87E COhl1E1pFcrcN+dqY3Q2SXsFMHHeQSNSWQKibQvW4e7CjP7Pq2h3KQkCEg/PgSss7T U/kaiXCNhye/W9iVmakFiKhYDk3RD2kaP7KHA1kg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Siddharth Vadapalli , Sasha Levin Subject: [PATCH 6.1 201/798] PCI: keystone: Fix if-statement expression in ks_pcie_quirk() Date: Mon, 14 Oct 2024 16:12:35 +0200 Message-ID: <20241014141225.821726305@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit 6188a1c762eb9bbd444f47696eda77a5eae6207a ] This code accidentally uses && where || was intended. It potentially results in a NULL dereference. Thus, fix the if-statement expression to use the correct condition. Fixes: 86f271f22bbb ("PCI: keystone: Add workaround for Errata #i2037 (AM65x SR 1.0)") Link: https://lore.kernel.org/linux-pci/1b762a93-e1b2-4af3-8c04-c8843905c279@stanley.mountain Signed-off-by: Dan Carpenter [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński Reviewed-by: Manivannan Sadhasivam Reviewed-by: Siddharth Vadapalli Signed-off-by: Sasha Levin --- drivers/pci/controller/dwc/pci-keystone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index e738013c6d4f5..ae5506293557e 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -580,7 +580,7 @@ static void ks_pcie_quirk(struct pci_dev *dev) */ if (pci_match_id(am6_pci_devids, bridge)) { bridge_dev = pci_get_host_bridge_device(dev); - if (!bridge_dev && !bridge_dev->parent) + if (!bridge_dev || !bridge_dev->parent) return; ks_pcie = dev_get_drvdata(bridge_dev->parent); -- 2.43.0