| Message ID | 1444634321-14902-1-git-send-email-gerlando.falauto@keymile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Gerlando Falauto <gerlando.falauto@keymile.com> Date: Mon, 12 Oct 2015 09:18:40 +0200 > When configuring the MDIO subsystem it is also necessary to configure > the TBI register. Make sure the TBI is contained within the mapped > register range in order to: > a) make sure the address is computed correctly > b) make users aware that we're actually accessing that register > > In case of error, print a message but continue anyway. > > Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> > Cc: Timur Tabi <timur@tabi.org> > Cc: David S. Miller <davem@davemloft.net> > Cc: Kumar Gala <galak@kernel.crashing.org> > --- > Changes from v1: > - Added type cast & fixed range > - removed freescale recipients Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 3c40f6b..5333d0a 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -445,6 +445,16 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) tbipa = data->get_tbipa(priv->map); + /* + * Add consistency check to make sure TBI is contained + * within the mapped range (not because we would get a + * segfault, rather to catch bugs in computing TBI + * address). Print error message but continue anyway. + */ + if ((void *)tbipa > priv->map + resource_size(&res) - 4) + dev_err(&pdev->dev, "invalid register map (should be at least 0x%04x to contain TBI address)\n", + ((void *)tbipa - priv->map) + 4); + iowrite32be(be32_to_cpup(prop), tbipa); } }
When configuring the MDIO subsystem it is also necessary to configure the TBI register. Make sure the TBI is contained within the mapped register range in order to: a) make sure the address is computed correctly b) make users aware that we're actually accessing that register In case of error, print a message but continue anyway. Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Cc: Timur Tabi <timur@tabi.org> Cc: David S. Miller <davem@davemloft.net> Cc: Kumar Gala <galak@kernel.crashing.org> --- Changes from v1: - Added type cast & fixed range - removed freescale recipients drivers/net/ethernet/freescale/fsl_pq_mdio.c | 10 ++++++++++ 1 file changed, 10 insertions(+)