Merge "msm: pcie: Add proper check before accessing variables" (a8e92fae) · Commits · e / devices / android_kernel_sony_msm8998

drivers/pci/host/pci-msm.c

+7 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2447,6 +2447,11 @@ static void msm_pcie_sel_debug_testcase(struct msm_pcie_dev_t *dev,

		break;
		case 13: /* dump all registers of base_sel */
		if (!base_sel) {
		PCIE_DBG_FS(dev, "Invalid base_sel: 0x%x\n", base_sel);
		break;
		}

		if (((base_sel - 1) >= MSM_PCIE_MAX_RES) \|\|
		(!dev->res[base_sel - 1].resource)) {
		PCIE_DBG_FS(dev, "PCIe: RC%d Resource does not exist\n",
		@@ -2454,10 +2459,7 @@ static void msm_pcie_sel_debug_testcase(struct msm_pcie_dev_t *dev,
		break;
		}

		if (!base_sel) {
		PCIE_DBG_FS(dev, "Invalid base_sel: 0x%x\n", base_sel);
		break;
		} else if (base_sel - 1 == MSM_PCIE_RES_PARF) {
		if (base_sel - 1 == MSM_PCIE_RES_PARF) {
		pcie_parf_dump(dev);
		break;
		} else if (base_sel - 1 == MSM_PCIE_RES_PHY) {