]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
phy: ocelot-serdes: fix out-of-bounds read
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Fri, 19 Oct 2018 09:21:38 +0000 (11:21 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Oct 2018 02:27:14 +0000 (19:27 -0700)
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.

Fix this by changing the condition in the for loop from
i <= SERDES_MAX to i < SERDES_MAX.

Addresses-Coverity-ID: 1473966 ("Out-of-bounds read")
Addresses-Coverity-ID: 1473959 ("Out-of-bounds read")
Fixes: 51f6b410fc22 ("phy: add driver for Microsemi Ocelot SerDes muxing")
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/phy/mscc/phy-ocelot-serdes.c

index b2be54680cf75b1db5860d5802bfec6704ae8476..cbb49d9da6f9a0c23daf7d687f733a12546264e7 100644 (file)
@@ -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;