| Message ID | 20240321164734.49273-2-m.kobuk@ispras.ru |
|---|---|
| State | Accepted |
| Commit | 627207703b73615653eea5ab7a841d5b478d961e |
| Headers | show |
| Series | [1/2] phy: marvell: a3700-comphy: Fix out of bounds read | expand |
Hi Mikhail, m.kobuk@ispras.ru wrote on Thu, 21 Mar 2024 19:47:31 +0300: > Replace hardcoded 'gbe_phy_init' array size by explicit one. > > Fixes: 934337080c6c ("phy: marvell: phy-mvebu-a3700-comphy: Add native kernel implementation") > Signed-off-by: Mikhail Kobuk <m.kobuk@ispras.ru> > --- > drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c > index 41162d7228c9..15bf10710de0 100644 > --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c > +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c > @@ -603,7 +603,7 @@ static void comphy_gbe_phy_init(struct mvebu_a3700_comphy_lane *lane, > u16 val; > > fix_idx = 0; > - for (addr = 0; addr < 512; addr++) { > + for (addr = 0; addr < ARRAY_SIZE(gbe_phy_init); addr++) { > /* > * All PHY register values are defined in full for 3.125Gbps > * SERDES speed. The values required for 1.25 Gbps are almost 512 is also used where gbe_phy_init is defined, so maybe it would be worthe defining this size once and then use the definition in both places. Thanks, Miquèl
diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c index 41162d7228c9..15bf10710de0 100644 --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c @@ -603,7 +603,7 @@ static void comphy_gbe_phy_init(struct mvebu_a3700_comphy_lane *lane, u16 val; fix_idx = 0; - for (addr = 0; addr < 512; addr++) { + for (addr = 0; addr < ARRAY_SIZE(gbe_phy_init); addr++) { /* * All PHY register values are defined in full for 3.125Gbps * SERDES speed. The values required for 1.25 Gbps are almost
Replace hardcoded 'gbe_phy_init' array size by explicit one. Fixes: 934337080c6c ("phy: marvell: phy-mvebu-a3700-comphy: Add native kernel implementation") Signed-off-by: Mikhail Kobuk <m.kobuk@ispras.ru> --- drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)