From patchwork Mon Oct 12 07:18:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 528916 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 493831402B0 for ; Mon, 12 Oct 2015 18:25:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752012AbbJLHZD (ORCPT ); Mon, 12 Oct 2015 03:25:03 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:51979 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbbJLHZB (ORCPT ); Mon, 12 Oct 2015 03:25:01 -0400 X-Greylist: delayed 356 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Oct 2015 03:25:01 EDT From: Gerlando Falauto To: netdev@vger.kernel.org, timur@tabi.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: ogabbay@advaoptical.com, bigeasy@linutronix.de, Gerlando Falauto , "David S. Miller" , Kumar Gala Subject: [PATCH v2 1/2] net/fsl_pq_mdio: check TBI address for consistency with mapped range Date: Mon, 12 Oct 2015 09:18:40 +0200 Message-Id: <1444634321-14902-1-git-send-email-gerlando.falauto@keymile.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1371041258-15298-1-git-send-email-ogabbay@advaoptical.com> References: <1371041258-15298-1-git-send-email-ogabbay@advaoptical.com> Received: from mailrelay by mail-de.keymile.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Timur Tabi Cc: David S. Miller Cc: Kumar Gala --- 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(+) 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); } }