From patchwork Fri Apr 8 20:37:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 608182 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 3qhWVd1Y8rz9t5w for ; Sat, 9 Apr 2016 06:37:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=oK1IfOzr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758914AbcDHUhf (ORCPT ); Fri, 8 Apr 2016 16:37:35 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33960 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752864AbcDHUhe (ORCPT ); Fri, 8 Apr 2016 16:37:34 -0400 Received: by mail-pa0-f68.google.com with SMTP id hb4so9706486pac.1; Fri, 08 Apr 2016 13:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Ek6tOoHGnCrFf3wrL2Lj/+bFHWhJTorvo52I/Dl/tNc=; b=oK1IfOzrsvbjGeeEQcqcpVLoKrXI3GOlaiWoySW+Jjs1RRwj92DyH0Xoy15zKE3CWJ iRIqMasFYwyXNvvDvHoapBUy0Ey00A7cbJIqnd2O/yFLBRqbomB1GhX6GbdRuKEVhslw 5wS5PiRZbBYPciee/sVRdwdZw+8W7spqstPHZYKSpzzRJZSDBmmpr1yBPOOOi667bj3S J95nRRCXrMZQOp8Uge5lWlJFRa3DOwX2LYnigT3e9fJkvrAKtggX/F1pUlApxOnYOaId j+74bnAl2pNUcRpSsOwWjxcZ+HZgw2cHC1iaY+245Sa4XsGiysOZkBsjunYwecJCudnl Jl0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ek6tOoHGnCrFf3wrL2Lj/+bFHWhJTorvo52I/Dl/tNc=; b=ix9DFtY2YWdZp40vnC/ndRJ65Dbcjmsy/6QFc2eN6n3QzclILCEhCg3q969jb7P0Oc bErrTdvBorN9G6PtnPlL3dSLbO5/A0U5WJYV5kXZ8OGKmduIwKSw+EwF8EYpxruMg9L9 afkSUI0XFHuKSrqm7zx61o+hkOgT/5KE+NkLIz1ZpLDtAp9ttbfmxtwisdmWv2FLHLh2 HH1TpYbC/nF+g729wpdw/awIZcfghZs1R0tG7SFC0iXoB2s4skpwMZCLOaNa9yp1+7HD xEGUE5jJnX94Ovw+70YsdiaGZp7z7F/uoqhBEbYOoB8dRbn+obizmM/AjiY6heBxwxz9 oCaQ== X-Gm-Message-State: AD7BkJJmOsIoZXcAUY43N7JxU/8bP5s/OWklqN3r8ZQ1Gadwr1ssYtqgpxRiHS/dGYWaTw== X-Received: by 10.66.132.103 with SMTP id ot7mr15316645pab.27.1460147853106; Fri, 08 Apr 2016 13:37:33 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id u2sm20600728pfi.26.2016.04.08.13.37.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Apr 2016 13:37:31 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u38KbU1c006996; Fri, 8 Apr 2016 13:37:30 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u38KbUqS006995; Fri, 8 Apr 2016 13:37:30 -0700 From: David Daney To: "David S. Miller" , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Robert Richter , Sunil Goutham , David Daney Subject: [PATCH] net: thunderx: Fix broken of_node_put() code. Date: Fri, 8 Apr 2016 13:37:27 -0700 Message-Id: <1460147847-6963-1-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Daney commit b7d3e3d3d21a ("net: thunderx: Don't leak phy device references on -EPROBE_DEFER condition.") incorrectly moved the call to of_node_put() outside of the loop. Under normal loop exit, the node has already had of_node_put() called, so the extra call results in: [ 8.228020] ERROR: Bad of_node_put() on /soc@0/pci@848000000000/mrml-bridge0@1,0/bgx0/xlaui00 [ 8.239433] CPU: 16 PID: 608 Comm: systemd-udevd Not tainted 4.6.0-rc1-numa+ #157 [ 8.247380] Hardware name: www.cavium.com EBB8800/EBB8800, BIOS 0.3 Mar 2 2016 [ 8.273541] Call trace: [ 8.273550] [] dump_backtrace+0x0/0x210 [ 8.273557] [] show_stack+0x24/0x2c [ 8.273560] [] dump_stack+0x8c/0xb4 [ 8.273566] [] of_node_release+0xa8/0xac [ 8.273570] [] kobject_cleanup+0x8c/0x194 [ 8.273573] [] kobject_put+0x44/0x6c [ 8.273576] [] of_node_put+0x24/0x30 [ 8.273587] [] bgx_probe+0x17c/0xcd8 [thunder_bgx] [ 8.273591] [] pci_device_probe+0xa0/0x114 [ 8.273596] [] driver_probe_device+0x178/0x418 [ 8.273599] [] __driver_attach+0x100/0x118 [ 8.273602] [] bus_for_each_dev+0x6c/0xac [ 8.273605] [] driver_attach+0x30/0x38 [ 8.273608] [] bus_add_driver+0x1f8/0x29c [ 8.273611] [] driver_register+0x70/0x110 [ 8.273617] [] __pci_register_driver+0x60/0x6c [ 8.273623] [] bgx_init_module+0x40/0x48 [thunder_bgx] [ 8.273626] [] do_one_initcall+0xcc/0x1c0 [ 8.273631] [] do_init_module+0x68/0x1c8 [ 8.273635] [] load_module+0xf44/0x11f4 [ 8.273638] [] SyS_finit_module+0xb8/0xe0 [ 8.273641] [] el0_svc_naked+0x24/0x28 Go back to the previous (correct) code that only did the extra of_node_put() call on early exit from the loop. Signed-off-by: David Daney --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 9679515..d20539a 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1011,10 +1011,11 @@ static int bgx_init_of_phy(struct bgx *bgx) } lmac++; - if (lmac == MAX_LMAC_PER_BGX) + if (lmac == MAX_LMAC_PER_BGX) { + of_node_put(node); break; + } } - of_node_put(node); return 0; defer: