From patchwork Mon Nov 5 15:24:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 10668507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64CC2175A for ; Mon, 5 Nov 2018 15:28:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5145F285A9 for ; Mon, 5 Nov 2018 15:28:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45449294E9; Mon, 5 Nov 2018 15:28:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0668285A9 for ; Mon, 5 Nov 2018 15:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729588AbeKFArJ (ORCPT ); Mon, 5 Nov 2018 19:47:09 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:44160 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729760AbeKFArI (ORCPT ); Mon, 5 Nov 2018 19:47:08 -0500 Received: by mail-pg1-f193.google.com with SMTP id w3-v6so4367159pgs.11; Mon, 05 Nov 2018 07:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5upJeVS2/PUxAj2eWycRTvspVro5k0eON4BnhkKqWZI=; b=u6Uyp8W7CAXr3If/J9mb+gSZrPK2+8YjQ17sTmNYPRbH6N8EiJwyBNUGCwaab1xbCn hsTDxLAKGHi4iFGR8qpgCjjjnvuaQfCg60dxseZkrmXDekssxZALvnaeUqL4wCK63lo+ rYeRHTU3cGMuZyODz1YcKHgZ7ie/mWyDggx1ekXPlP6+7uR/oYOP+REtaPb+CVAmJBza 5STEzs3YivUmVhOz7RL3lWzGIB6GjvXCl5GCuYSN7YslQQ2KklxECBIHZhMwVJzipmUz YOl14me/40Eqqwc7/H4MtOXWK+/WVPJlkO5YUKwnuFubT8nDoIZep7PbtSdoWkJzpT7E McqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5upJeVS2/PUxAj2eWycRTvspVro5k0eON4BnhkKqWZI=; b=dtlxgPQTRExOLElWGQ9FFvaKs0wc3FjrCGPvTrgHMc1X3jP6CxF+KCRfSH+edrIzbY bH+d2TQdD4nwdQh4YHZ/L4U72WzyORaL0lD+kw9icQ5kw4F4ZGeha8Ntg98cRafRF0Ax 2IaSeWbAOyGlfxnXmKw/wTt8MYGfpvrUu6dzIk+Wv+k4uey0jnVKcCmbE3VAPWrXmhhv BdmRUnOsDGCPZOy0j5Uhl2lIBSCXHPfi+jgN2Mm37861FJ0U1m0dju25VCzn9c1IKHGd tjqZknoTTn1uSRzJSPkTSyhDURAf3DZnu6Wfc12hOoEwT7yRIKo034evwMXY9n4zslO8 wcJA== X-Gm-Message-State: AGRZ1gIHXRfl/KrLBEO2yx8Aj5A1sF4ed8wDkslAQZGR/JRdREXGSuBN /cCOqP3SwRDziq33fspblcE= X-Google-Smtp-Source: AJdET5eft/ysZdTfPBISQiwUgbtavcV7Z1PcH9C5ex7/2/drzVi7qckOucK4A6jPF2vbqtiH0x0big== X-Received: by 2002:a62:5b43:: with SMTP id p64-v6mr23081205pfb.122.1541431614863; Mon, 05 Nov 2018 07:26:54 -0800 (PST) Received: from localhost.localdomain (c-24-6-192-50.hsd1.ca.comcast.net. [24.6.192.50]) by smtp.gmail.com with ESMTPSA id u76-v6sm37260578pfa.176.2018.11.05.07.26.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Nov 2018 07:26:54 -0800 (PST) From: frowand.list@gmail.com To: Rob Herring , Pantelis Antoniou , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Alan Tull , Moritz Fischer Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v6 02/18] of: overlay: add missing of_node_put() after add new node to changeset Date: Mon, 5 Nov 2018 07:24:59 -0800 Message-Id: <1541431515-25197-3-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1541431515-25197-1-git-send-email-frowand.list@gmail.com> References: <1541431515-25197-1-git-send-email-frowand.list@gmail.com> Sender: linux-fpga-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Frank Rowand The refcount of a newly added overlay node decrements to one (instead of zero) when the overlay changeset is destroyed. This change will cause the final decrement be to zero. After applying this patch, new validation warnings will be reported from the devicetree unittest during boot due to a pre-existing devicetree bug. The warnings will be similar to: OF: ERROR: memory leak before free overlay changeset, /testcase-data/overlay-node/test-bus/test-unittest4 This pre-existing devicetree bug will also trigger a WARN_ONCE() from refcount_sub_and_test_checked() when an overlay changeset is destroyed without having first been applied. This scenario occurs when an error in the overlay is detected during the overlay changeset creation: WARNING: CPU: 0 PID: 1 at lib/refcount.c:187 refcount_sub_and_test_checked+0xa8/0xbc refcount_t: underflow; use-after-free. (unwind_backtrace) from (show_stack+0x10/0x14) (show_stack) from (dump_stack+0x6c/0x8c) (dump_stack) from (__warn+0xdc/0x104) (__warn) from (warn_slowpath_fmt+0x44/0x6c) (warn_slowpath_fmt) from (refcount_sub_and_test_checked+0xa8/0xbc) (refcount_sub_and_test_checked) from (kobject_put+0x24/0x208) (kobject_put) from (of_changeset_destroy+0x2c/0xb4) (of_changeset_destroy) from (free_overlay_changeset+0x1c/0x9c) (free_overlay_changeset) from (of_overlay_remove+0x284/0x2cc) (of_overlay_remove) from (of_unittest_apply_revert_overlay_check.constprop.4+0xf8/0x1e8) (of_unittest_apply_revert_overlay_check.constprop.4) from (of_unittest_overlay+0x960/0xed8) (of_unittest_overlay) from (of_unittest+0x1cc4/0x2138) (of_unittest) from (do_one_initcall+0x4c/0x28c) (do_one_initcall) from (kernel_init_freeable+0x29c/0x378) (kernel_init_freeable) from (kernel_init+0x8/0x110) (kernel_init) from (ret_from_fork+0x14/0x2c) Tested-by: Alan Tull Signed-off-by: Frank Rowand --- drivers/of/overlay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index f5fc8859a7ee..7613f7d680c7 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -379,7 +379,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs, if (ret) return ret; - return build_changeset_next_level(ovcs, tchild, node); + ret = build_changeset_next_level(ovcs, tchild, node); + of_node_put(tchild); + return ret; } if (node->phandle && tchild->phandle)