From patchwork Mon Oct 15 00:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 10640981 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 20C4D17E1 for ; Mon, 15 Oct 2018 00:27:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EE5B2899F for ; Mon, 15 Oct 2018 00:27:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03327296FF; Mon, 15 Oct 2018 00:27:08 +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 94A862899F for ; Mon, 15 Oct 2018 00:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbeJOIJB (ORCPT ); Mon, 15 Oct 2018 04:09:01 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:43004 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbeJOII7 (ORCPT ); Mon, 15 Oct 2018 04:08:59 -0400 Received: by mail-pl1-f196.google.com with SMTP id c8-v6so8389383plo.9; Sun, 14 Oct 2018 17:26:11 -0700 (PDT) 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=BwKhWXvi9uObifIA2caG7KxBnrbJ0SRY7Oj5Ow4g1sM=; b=IbdZSPqRTU12HVAPHQC4U1kmpBQ/wG7dpte77EPwS66x6e8kFeTncfdzvPTuAGU7J1 JtsvQDXItXJDfO7QBnceRhyyxDm7Y1LxQtK+TQ+MlS+z9Iafk8rDkv44qeORwZE4YwIE AAlKpJpIjxY9kbWSxyZ33822j2MVCqBhTOPsy3+6Xtk0jxO+jXp7uAo8nJHbduiRuM5S eTTsVtkeVoVilYKVoNFrGRPIix+27qVqMyOYbadmOVqVXplefpDodNy0CWfnVoVU6NtB cjXugPeUdfm4jShYIhwELZyBoDSlmWLma0bPKcDnRiNkkGMFaXD2Ge2qV0Vl576JB26p e9uA== 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=BwKhWXvi9uObifIA2caG7KxBnrbJ0SRY7Oj5Ow4g1sM=; b=LXsiSTbOYT/rwMYnbAdnfhjwHPHrUJAic6jEABcn7omAIPzuArvoW/Kk+cg4wxpwWD wXm+STBgTHZVrW4xNO09PARBX5NBPnnOr0pmv4ENnnykZ6suu6tm+GkiEH+EbIZSSyoc GGvBagu5YWwnKNny2a+mUIc8v+n/mVPdtX8qUBJIVugwUGC4ydeYkz9VkwNgXYhQAP4X DBaDZnj3O3BIn0RcZejJ9t1ehmZcui1kjaWMqfw6WLxuKsFV/8910wjji72+yq45frIm b5gY/BeKcuzThbZwlhyFBGvAeMJhEFwRKtdtDDK9X+nndIbSaT42hdzzG1nwY4M8VkWP fNhg== X-Gm-Message-State: ABuFfogsRv2mQmUVBZ7i6BRA/g3ZdTG/udYcSyYsNS5JacQPUkSQIRwX hZf8heM+Nj/IjLOr0SwrZtY= X-Google-Smtp-Source: ACcGV62ywluIyp6JpHbWu/PeeqzKheUynLyUIcb7WKzM6BBqBdM2qDzXyzJKjBOd9MjYJYlS0/RJ5Q== X-Received: by 2002:a17:902:1129:: with SMTP id d38-v6mr9609107pla.270.1539563171237; Sun, 14 Oct 2018 17:26:11 -0700 (PDT) Received: from localhost.localdomain (c-24-6-192-50.hsd1.ca.comcast.net. [24.6.192.50]) by smtp.gmail.com with ESMTPSA id j14-v6sm11387110pgh.52.2018.10.14.17.26.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Oct 2018 17:26:10 -0700 (PDT) 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 v3 09/18] of: overlay: validate overlay properties #address-cells and #size-cells Date: Sun, 14 Oct 2018 17:24:21 -0700 Message-Id: <1539563070-12969-10-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1539563070-12969-1-git-send-email-frowand.list@gmail.com> References: <1539563070-12969-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 If overlay properties #address-cells or #size-cells are already in the live devicetree for any given node, then the values in the overlay must match the values in the live tree. If the properties are already in the live tree then there is no need to create a changeset entry to add them since they must have the same value. This reduces the memory used by the changeset and eliminates a possible memory leak. This is verified by 12 fewer warnings during the devicetree unittest, as the possible memory leak warnings about #address-cells and Signed-off-by: Frank Rowand --- drivers/of/overlay.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 272a0d1a5e18..ee66651db553 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -287,7 +287,12 @@ static struct property *dup_and_fixup_symbol_prop( * @target may be either in the live devicetree or in a new subtree that * is contained in the changeset. * - * Some special properties are not updated (no error returned). + * Some special properties are not added or updated (no error returned): + * "name", "phandle", "linux,phandle". + * + * Properties "#address-cells" and "#size-cells" are not updated if they + * are already in the live tree, but if present in the live tree, the values + * in the overlay must match the values in the live tree. * * Update of property in symbols node is not allowed. * @@ -300,6 +305,7 @@ static int add_changeset_property(struct overlay_changeset *ovcs, { struct property *new_prop = NULL, *prop; int ret = 0; + bool check_for_non_overlay_node = false; if (!of_prop_cmp(overlay_prop->name, "name") || !of_prop_cmp(overlay_prop->name, "phandle") || @@ -322,13 +328,39 @@ static int add_changeset_property(struct overlay_changeset *ovcs, if (!new_prop) return -ENOMEM; - if (!prop) + if (!prop) { + + check_for_non_overlay_node = true; ret = of_changeset_add_property(&ovcs->cset, target->np, new_prop); - else + + } else if (!of_prop_cmp(prop->name, "#address-cells")) { + + if (prop->length != 4 || new_prop->length != 4 || + *(u32 *)prop->value != *(u32 *)new_prop->value) + pr_err("ERROR: overlay and/or live tree #address-cells invalid in node %pOF\n", + target->np); + + } else if (!of_prop_cmp(prop->name, "#size-cells")) { + + if (prop->length != 4 || new_prop->length != 4 || + *(u32 *)prop->value != *(u32 *)new_prop->value) + pr_err("ERROR: overlay and/or live tree #size-cells invalid in node %pOF\n", + target->np); + + } else { + + check_for_non_overlay_node = true; ret = of_changeset_update_property(&ovcs->cset, target->np, new_prop); + } + + if (check_for_non_overlay_node && + !of_node_check_flag(target->np, OF_OVERLAY)) + pr_err("WARNING: %s(), memory leak will occur if overlay removed. Property: %pOF/%s\n", + __func__, target->np, new_prop->name); + if (ret) { kfree(new_prop->name); kfree(new_prop->value);