From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752041AbbJLHZG (ORCPT ); Mon, 12 Oct 2015 03:25:06 -0400 Received: from mail-de.keymile.com ([195.8.104.250]:51991 "EHLO mail-de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752003AbbJLHZD (ORCPT ); Mon, 12 Oct 2015 03:25:03 -0400 X-Greylist: delayed 359 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Oct 2015 03:25:03 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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); } } -- 1.8.0.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerlando Falauto 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> References: <1371041258-15298-1-git-send-email-ogabbay@advaoptical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: bigeasy@linutronix.de, "David S. Miller" , Gerlando Falauto , ogabbay@advaoptical.com To: netdev@vger.kernel.org, timur@tabi.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1371041258-15298-1-git-send-email-ogabbay@advaoptical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: netdev.vger.kernel.org V2hlbiBjb25maWd1cmluZyB0aGUgTURJTyBzdWJzeXN0ZW0gaXQgaXMgYWxzbyBuZWNlc3Nhcnkg dG8gY29uZmlndXJlCnRoZSBUQkkgcmVnaXN0ZXIuIE1ha2Ugc3VyZSB0aGUgVEJJIGlzIGNvbnRh aW5lZCB3aXRoaW4gdGhlIG1hcHBlZApyZWdpc3RlciByYW5nZSBpbiBvcmRlciB0bzoKYSkgbWFr ZSBzdXJlIHRoZSBhZGRyZXNzIGlzIGNvbXB1dGVkIGNvcnJlY3RseQpiKSBtYWtlIHVzZXJzIGF3 YXJlIHRoYXQgd2UncmUgYWN0dWFsbHkgYWNjZXNzaW5nIHRoYXQgcmVnaXN0ZXIKCkluIGNhc2Ug b2YgZXJyb3IsIHByaW50IGEgbWVzc2FnZSBidXQgY29udGludWUgYW55d2F5LgoKU2lnbmVkLW9m Zi1ieTogR2VybGFuZG8gRmFsYXV0byA8Z2VybGFuZG8uZmFsYXV0b0BrZXltaWxlLmNvbT4KQ2M6 IFRpbXVyIFRhYmkgPHRpbXVyQHRhYmkub3JnPgpDYzogRGF2aWQgUy4gTWlsbGVyIDxkYXZlbUBk YXZlbWxvZnQubmV0PgpDYzogS3VtYXIgR2FsYSA8Z2FsYWtAa2VybmVsLmNyYXNoaW5nLm9yZz4K LS0tCkNoYW5nZXMgZnJvbSB2MToKLSBBZGRlZCB0eXBlIGNhc3QgJiBmaXhlZCByYW5nZQotIHJl bW92ZWQgZnJlZXNjYWxlIHJlY2lwaWVudHMKCiBkcml2ZXJzL25ldC9ldGhlcm5ldC9mcmVlc2Nh bGUvZnNsX3BxX21kaW8uYyB8IDEwICsrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNl cnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvZXRoZXJuZXQvZnJlZXNjYWxlL2Zz bF9wcV9tZGlvLmMgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9mcmVlc2NhbGUvZnNsX3BxX21kaW8u YwppbmRleCAzYzQwZjZiLi41MzMzZDBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC9ldGhlcm5l dC9mcmVlc2NhbGUvZnNsX3BxX21kaW8uYworKysgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9mcmVl c2NhbGUvZnNsX3BxX21kaW8uYwpAQCAtNDQ1LDYgKzQ0NSwxNiBAQCBzdGF0aWMgaW50IGZzbF9w cV9tZGlvX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAKIAkJCXRiaXBhID0g ZGF0YS0+Z2V0X3RiaXBhKHByaXYtPm1hcCk7CiAKKwkJCS8qCisJCQkgKiBBZGQgY29uc2lzdGVu Y3kgY2hlY2sgdG8gbWFrZSBzdXJlIFRCSSBpcyBjb250YWluZWQKKwkJCSAqIHdpdGhpbiB0aGUg bWFwcGVkIHJhbmdlIChub3QgYmVjYXVzZSB3ZSB3b3VsZCBnZXQgYQorCQkJICogc2VnZmF1bHQs IHJhdGhlciB0byBjYXRjaCBidWdzIGluIGNvbXB1dGluZyBUQkkKKwkJCSAqIGFkZHJlc3MpLiBQ cmludCBlcnJvciBtZXNzYWdlIGJ1dCBjb250aW51ZSBhbnl3YXkuCisJCQkgKi8KKwkJCWlmICgo dm9pZCAqKXRiaXBhID4gcHJpdi0+bWFwICsgcmVzb3VyY2Vfc2l6ZSgmcmVzKSAtIDQpCisJCQkJ ZGV2X2VycigmcGRldi0+ZGV2LCAiaW52YWxpZCByZWdpc3RlciBtYXAgKHNob3VsZCBiZSBhdCBs ZWFzdCAweCUwNHggdG8gY29udGFpbiBUQkkgYWRkcmVzcylcbiIsCisJCQkJCSgodm9pZCAqKXRi aXBhIC0gcHJpdi0+bWFwKSArIDQpOworCiAJCQlpb3dyaXRlMzJiZShiZTMyX3RvX2NwdXAocHJv cCksIHRiaXBhKTsKIAkJfQogCX0KLS0gCjEuOC4wLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4cHBjLWRldiBtYWlsaW5nIGxpc3QKTGludXhw cGMtZGV2QGxpc3RzLm96bGFicy5vcmcKaHR0cHM6Ly9saXN0cy5vemxhYnMub3JnL2xpc3RpbmZv L2xpbnV4cHBjLWRldg==