From patchwork Fri Oct 9 15:15:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 528253 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 41DD21402B2 for ; Sat, 10 Oct 2015 02:24:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755488AbbJIPWe (ORCPT ); Fri, 9 Oct 2015 11:22:34 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:33795 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754750AbbJIPWK (ORCPT ); Fri, 9 Oct 2015 11:22:10 -0400 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 , Timur Tabi , "David S. Miller" , Andy Fleming , Kumar Gala Subject: [PATCH 1/2] net/fsl_pq_mdio: check TBI address for consistency with mapped range Date: Fri, 9 Oct 2015 17:15:07 +0200 Message-Id: <1444403708-16576-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. Change-Id: If1e7d8931f440ea9259726c36d3df797dda016fb Signed-off-by: Gerlando Falauto Cc: Timur Tabi Cc: David S. Miller Cc: Andy Fleming Cc: Kumar Gala Acked-by: Timur Tabi --- 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..4618011 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 (tbipa > priv->map + resource_size(&res)) + 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); } }