Merge "msm: pcie: Add proper check before accessing variables" into msm-4.14 (f39ac287) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/pci/host/pci-msm.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -1549,6 +1549,13 @@ static void msm_pcie_sel_debug_testcase(struct msm_pcie_dev_t *dev,
		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",
		dev->rc_idx);
		break;
		}

		PCIE_DBG_FS(dev,
		"base: %s: 0x%pK\nwr_offset: 0x%x\nwr_mask: 0x%x\nwr_value: 0x%x\n",
		dev->res[base_sel - 1].name,
		@@ -1568,6 +1575,13 @@ static void msm_pcie_sel_debug_testcase(struct msm_pcie_dev_t *dev,

		break;
		case MSM_PCIE_DUMP_PCIE_REGISTER_SPACE:
		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",
		dev->rc_idx);
		break;
		}

		if (!base_sel) {
		PCIE_DBG_FS(dev, "Invalid base_sel: 0x%x\n", base_sel);
		break;