From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757332Ab0KALpu (ORCPT ); Mon, 1 Nov 2010 07:45:50 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:58824 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754966Ab0KALpt (ORCPT ); Mon, 1 Nov 2010 07:45:49 -0400 Message-ID: <4CCEA800.9040500@mvista.com> Date: Mon, 01 Nov 2010 14:44:00 +0300 From: Sergei Shtylyov User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.9) Gecko/20100915 Thunderbird/3.1.4 MIME-Version: 1.0 To: Grant Likely CC: David Daney , linux-mips@linux-mips.org, ralf@linux-mips.org, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Jeremy Kerr , Benjamin Herrenschmidt , Dan Carpenter , Greg Kroah-Hartman Subject: Re: [PATCH] of: of_mdio: Fix some endianness problems. References: <1288227827-5447-1-git-send-email-ddaney@caviumnetworks.com> <20101030063237.GC2456@angua.secretlab.ca> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 31-10-2010 5:54, Grant Likely wrote: >>> In of_mdiobus_register(), the __be32 *addr variable is dereferenced. >>> This will not work on little-endian targets. Also since it is >>> unsigned, checking for less than zero is redundant. >>> Fix these two issues. >>> Signed-off-by: David Daney >>> Cc: Grant Likely >>> Cc: Jeremy Kerr >>> Cc: Benjamin Herrenschmidt >>> Cc: Dan Carpenter >>> Cc: Greg Kroah-Hartman >>> --- >>> drivers/of/of_mdio.c | 23 ++++++++++++++--------- >>> 1 files changed, 14 insertions(+), 9 deletions(-) >>> >>> diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c >>> index 1fce00e..b370306 100644 >>> --- a/drivers/of/of_mdio.c >>> +++ b/drivers/of/of_mdio.c >>> @@ -52,27 +52,32 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) >>> >>> /* Loop over the child nodes and register a phy_device for each one */ >>> for_each_child_of_node(np, child) { >>> - const __be32 *addr; >>> + const __be32 *paddr; >>> + u32 addr; >>> int len; >>> >>> /* A PHY must have a reg property in the range [0-31] */ >>> - addr = of_get_property(child, "reg",&len); >>> - if (!addr || len< sizeof(*addr) || *addr>= 32 || *addr< 0) { >>> + paddr = of_get_property(child, "reg",&len); >>> + if (!paddr || len< sizeof(*paddr)) { >>> +addr_err: >>> dev_err(&mdio->dev, "%s has invalid PHY address\n", >>> child->full_name); >>> continue; >>> } >>> + addr = be32_to_cpup(paddr); >>> + if (addr>= 32) >>> + goto addr_err; >> goto's are fine for jumping to the end of a function to unwind >> allocations, but please don't use it in this manner. The original >> structure will actually work just fine if you do it thusly: >> if (!paddr || len< sizeof(*paddr) || >> *(addr = be32_to_cpup(paddr))>= 32) { >> dev_err(&mdio->dev, "%s has invalid PHY address\n", >> child->full_name); >> continue; >> } >> Otherwise this patch looks good. After you've reworked and retested >> I'll pick it up for 2.6.37 (or dave will). > Actually, I mistyped this. I think it should be: > > if (!paddr || len< sizeof(*paddr) || > (addr = be32_to_cpup(paddr))>= 32) { This assignment would probably cause checkpatch.pl to complain... WBR, Sergei