Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06773ce4 authored by Bharat Gooty's avatar Bharat Gooty Committed by Greg Kroah-Hartman
Browse files

PCI: iproc: Fix out-of-bound array accesses 

[ Upstream commit a3ff529f5d368a17ff35ada8009e101162ebeaf9 ]

Declare the full size array for all revisions of PAX register sets
to avoid potentially out of bound access of the register array
when they are being initialized in iproc_pcie_rev_init().

Link: https://lore.kernel.org/r/20201001060054.6616-2-srinath.mannam@broadcom.com


Fixes: 06324ede ("PCI: iproc: Improve core register population")
Signed-off-by: default avatarBharat Gooty <bharat.gooty@broadcom.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e9817c8c

drivers/pci/controller/pcie-iproc.c

+5 −5
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ enum iproc_pcie_reg { 
};



/* iProc PCIe PAXB BCMA registers */

static const u16 iproc_pcie_reg_paxb_bcma[] = {

static const u16 iproc_pcie_reg_paxb_bcma[IPROC_PCIE_MAX_NUM_REG] = {

	[IPROC_PCIE_CLK_CTRL]		= 0x000,

	[IPROC_PCIE_CFG_IND_ADDR]	= 0x120,

	[IPROC_PCIE_CFG_IND_DATA]	= 0x124,
@@ -311,7 +311,7 @@ static const u16 iproc_pcie_reg_paxb_bcma[] = { 
};



/* iProc PCIe PAXB registers */

static const u16 iproc_pcie_reg_paxb[] = {

static const u16 iproc_pcie_reg_paxb[IPROC_PCIE_MAX_NUM_REG] = {

	[IPROC_PCIE_CLK_CTRL]		= 0x000,

	[IPROC_PCIE_CFG_IND_ADDR]	= 0x120,

	[IPROC_PCIE_CFG_IND_DATA]	= 0x124,
@@ -327,7 +327,7 @@ static const u16 iproc_pcie_reg_paxb[] = { 
};



/* iProc PCIe PAXB v2 registers */

static const u16 iproc_pcie_reg_paxb_v2[] = {

static const u16 iproc_pcie_reg_paxb_v2[IPROC_PCIE_MAX_NUM_REG] = {

	[IPROC_PCIE_CLK_CTRL]		= 0x000,

	[IPROC_PCIE_CFG_IND_ADDR]	= 0x120,

	[IPROC_PCIE_CFG_IND_DATA]	= 0x124,
@@ -355,7 +355,7 @@ static const u16 iproc_pcie_reg_paxb_v2[] = { 
};



/* iProc PCIe PAXC v1 registers */

static const u16 iproc_pcie_reg_paxc[] = {

static const u16 iproc_pcie_reg_paxc[IPROC_PCIE_MAX_NUM_REG] = {

	[IPROC_PCIE_CLK_CTRL]		= 0x000,

	[IPROC_PCIE_CFG_IND_ADDR]	= 0x1f0,

	[IPROC_PCIE_CFG_IND_DATA]	= 0x1f4,
@@ -364,7 +364,7 @@ static const u16 iproc_pcie_reg_paxc[] = { 
};



/* iProc PCIe PAXC v2 registers */

static const u16 iproc_pcie_reg_paxc_v2[] = {

static const u16 iproc_pcie_reg_paxc_v2[IPROC_PCIE_MAX_NUM_REG] = {

	[IPROC_PCIE_MSI_GIC_MODE]	= 0x050,

	[IPROC_PCIE_MSI_BASE_ADDR]	= 0x074,

	[IPROC_PCIE_MSI_WINDOW_SIZE]	= 0x078,