Merge "msm: pcie: Add proper check before accessing variables" (125ced07) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/pci/host/pci-msm.c

+15 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2018, 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
		@@ -2370,6 +2370,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%p\nwr_offset: 0x%x\nwr_mask: 0x%x\nwr_value: 0x%x\n",
		dev->res[base_sel - 1].name,
		@@ -2389,6 +2396,13 @@ 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 - 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;