]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
octeontx2-pf: Fix otx2_get_fecparam()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 17 Feb 2021 07:41:39 +0000 (10:41 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2021 22:33:22 +0000 (14:33 -0800)
Static checkers complained about an off by one read overflow in
otx2_get_fecparam() and we applied two conflicting fixes for it.

Correct: b0aae0bde26f ("octeontx2: Fix condition.")
  Wrong: 93efb0c65683 ("octeontx2-pf: Fix out-of-bounds read in otx2_get_fecparam()")

Revert the incorrect fix.

Fixes: 93efb0c65683 ("octeontx2-pf: Fix out-of-bounds read in otx2_get_fecparam()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c

index 5fe74036a6114764143400ba8f9195423b78be87..f4962a97a0757ca5cf6b95f396a8698bfa5f4e3f 100644 (file)
@@ -968,7 +968,7 @@ static int otx2_get_fecparam(struct net_device *netdev,
                if (!rsp->fwdata.supported_fec)
                        fecparam->fec = ETHTOOL_FEC_NONE;
                else
-                       fecparam->fec = fec[rsp->fwdata.supported_fec - 1];
+                       fecparam->fec = fec[rsp->fwdata.supported_fec];
        }
        return 0;
 }