diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-23 05:27:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-23 05:27:15 +0300 |
| commit | 627d39c397999668557f6268b48ec8a74b6d2b0b (patch) | |
| tree | 0cfb067435cb242ef1b9e8eef53a4ab5285aaa49 | |
| parent | 29e270fc32192e7729057963ae7120663856c93e (diff) | |
| parent | 6acb47d1a318e5b3b7115354ebc4ea060c59d3a1 (diff) | |
| download | linux-627d39c397999668557f6268b48ec8a74b6d2b0b.tar.xz | |
Merge branch 'phy-ocelot-serdes-fix-out-of-bounds-read'
Gustavo A. R. Silva says:
====================
phy: ocelot-serdes: fix out-of-bounds read
This patchset aims to fix an out-of-bounds bug in
the phy-ocelot-serdes driver.
Currently, there is an out-of-bounds read on array ctrl->phys,
once variable i reaches the maximum array size of SERDES_MAX
in the for loop.
Quentin Schulz pointed out that SERDES_MAX is a valid value to
index ctrl->phys. So, I updated SERDES_MAX to be SERDES6G_MAX + 1
in include/dt-bindings/phy/phy-ocelot-serdes.h.
Then I changed the condition in the for loop from
i <= SERDES_MAX to i < SERDES_MAX in order to
complete the fix.
The reason I'm sending this fix as series is because
checkpatch reported an error when I first tried to
integrate the whole solution into a singe patch. So,
changes to dt-bindings should be sent as a separate
patch.
Changes in v3:
- Post the series to netdev, so Dave can take it.
Changes in v2:
- Send the whole series to Kishon Vijay Abraham I, so it
can be taken into the PHY tree.
- Add Quentin's Reviewed-by to commit log in both patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/phy/mscc/phy-ocelot-serdes.c | 4 | ||||
| -rw-r--r-- | include/dt-bindings/phy/phy-ocelot-serdes.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c index b2be54680cf7..cbb49d9da6f9 100644 --- a/drivers/phy/mscc/phy-ocelot-serdes.c +++ b/drivers/phy/mscc/phy-ocelot-serdes.c @@ -206,7 +206,7 @@ static struct phy *serdes_simple_xlate(struct device *dev, port = args->args[0]; idx = args->args[1]; - for (i = 0; i <= SERDES_MAX; i++) { + for (i = 0; i < SERDES_MAX; i++) { struct serdes_macro *macro = phy_get_drvdata(ctrl->phys[i]); if (idx != macro->idx) @@ -260,7 +260,7 @@ static int serdes_probe(struct platform_device *pdev) if (IS_ERR(ctrl->regs)) return PTR_ERR(ctrl->regs); - for (i = 0; i <= SERDES_MAX; i++) { + for (i = 0; i < SERDES_MAX; i++) { ret = serdes_phy_create(ctrl, i, &ctrl->phys[i]); if (ret) return ret; diff --git a/include/dt-bindings/phy/phy-ocelot-serdes.h b/include/dt-bindings/phy/phy-ocelot-serdes.h index bd28f21206f6..fe70adaca68f 100644 --- a/include/dt-bindings/phy/phy-ocelot-serdes.h +++ b/include/dt-bindings/phy/phy-ocelot-serdes.h @@ -7,6 +7,6 @@ #define SERDES1G_MAX SERDES1G(5) #define SERDES6G(x) (SERDES1G_MAX + 1 + (x)) #define SERDES6G_MAX SERDES6G(2) -#define SERDES_MAX SERDES6G_MAX +#define SERDES_MAX (SERDES6G_MAX + 1) #endif |