From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v6 09/18] of: overlay: validate overlay properties #address-cells and #size-cells Date: Mon, 5 Nov 2018 07:25:06 -0800 [thread overview] Message-ID: <1541431515-25197-10-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <1541431515-25197-1-git-send-email-frowand.list@gmail.com> From: Frank Rowand <frank.rowand@sony.com> 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. Tested-by: Alan Tull <atull@kernel.org> Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- drivers/of/overlay.c | 32 +++++++++++++++++++++++++++++--- include/linux/of.h | 6 ++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 15be3da34fef..72bf00adb9c8 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,12 +328,32 @@ 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 (!of_prop_val_eq(prop, new_prop)) { + pr_err("ERROR: changing value of #address-cells is not allowed in %pOF\n", + target->np); + ret = -EINVAL; + } + } else if (!of_prop_cmp(prop->name, "#size-cells")) { + if (!of_prop_val_eq(prop, new_prop)) { + pr_err("ERROR: changing value of #size-cells is not allowed in %pOF\n", + target->np); + ret = -EINVAL; + } + } 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: memory leak will occur if overlay removed, property: %pOF/%s\n", + target->np, new_prop->name); if (ret) { kfree(new_prop->name); diff --git a/include/linux/of.h b/include/linux/of.h index 5dd9ff480397..f247a3f557e0 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -990,6 +990,12 @@ static inline int of_map_rid(struct device_node *np, u32 rid, #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) #endif +static inline int of_prop_val_eq(struct property *p1, struct property *p2) +{ + return p1->length == p2->length && + !memcmp(p1->value, p2->value, (size_t)p1->length); +} + #if defined(CONFIG_OF) && defined(CONFIG_NUMA) extern int of_node_to_nid(struct device_node *np); #else -- Frank Rowand <frank.rowand@sony.com>
WARNING: multiple messages have this Message-ID (diff)
From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: devicetree@vger.kernel.org, linux-fpga@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 09/18] of: overlay: validate overlay properties #address-cells and #size-cells Date: Mon, 5 Nov 2018 07:25:06 -0800 [thread overview] Message-ID: <1541431515-25197-10-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <1541431515-25197-1-git-send-email-frowand.list@gmail.com> From: Frank Rowand <frank.rowand@sony.com> 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. Tested-by: Alan Tull <atull@kernel.org> Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- drivers/of/overlay.c | 32 +++++++++++++++++++++++++++++--- include/linux/of.h | 6 ++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 15be3da34fef..72bf00adb9c8 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,12 +328,32 @@ 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 (!of_prop_val_eq(prop, new_prop)) { + pr_err("ERROR: changing value of #address-cells is not allowed in %pOF\n", + target->np); + ret = -EINVAL; + } + } else if (!of_prop_cmp(prop->name, "#size-cells")) { + if (!of_prop_val_eq(prop, new_prop)) { + pr_err("ERROR: changing value of #size-cells is not allowed in %pOF\n", + target->np); + ret = -EINVAL; + } + } 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: memory leak will occur if overlay removed, property: %pOF/%s\n", + target->np, new_prop->name); if (ret) { kfree(new_prop->name); diff --git a/include/linux/of.h b/include/linux/of.h index 5dd9ff480397..f247a3f557e0 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -990,6 +990,12 @@ static inline int of_map_rid(struct device_node *np, u32 rid, #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) #endif +static inline int of_prop_val_eq(struct property *p1, struct property *p2) +{ + return p1->length == p2->length && + !memcmp(p1->value, p2->value, (size_t)p1->length); +} + #if defined(CONFIG_OF) && defined(CONFIG_NUMA) extern int of_node_to_nid(struct device_node *np); #else -- Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-11-05 15:27 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-05 15:24 [PATCH v6 00/18] of: overlay: validation checks, subsequent fixes frowand.list 2018-11-05 15:24 ` frowand.list 2018-11-05 15:24 ` [PATCH v6 01/18] of: overlay: add tests to validate kfrees from overlay removal frowand.list 2018-11-05 15:24 ` frowand.list 2018-11-05 15:24 ` [PATCH v6 02/18] of: overlay: add missing of_node_put() after add new node to changeset frowand.list 2018-11-05 15:24 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 03/18] of: overlay: add missing of_node_get() in __of_attach_node_sysfs frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-07 12:14 ` Michael Ellerman 2018-11-07 12:14 ` Michael Ellerman 2018-11-07 14:57 ` Frank Rowand 2018-11-07 14:57 ` Frank Rowand 2018-11-05 15:25 ` [PATCH v6 04/18] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-07 12:23 ` Michael Ellerman 2018-11-07 12:23 ` Michael Ellerman 2018-11-07 14:58 ` Frank Rowand 2018-11-07 14:58 ` Frank Rowand 2018-11-05 15:25 ` [PATCH v6 05/18] of: overlay: use prop add changeset entry for property in new nodes frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 06/18] of: overlay: do not duplicate properties from overlay for " frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 07/18] of: dynamic: change type of of_{at,de}tach_node() to void frowand.list 2018-11-05 15:25 ` [PATCH v6 07/18] of: dynamic: change type of of_{at, de}tach_node() " frowand.list 2018-11-07 12:08 ` [PATCH v6 07/18] of: dynamic: change type of of_{at,de}tach_node() " Michael Ellerman 2018-11-07 12:08 ` [PATCH v6 07/18] of: dynamic: change type of of_{at, de}tach_node() " Michael Ellerman 2018-11-07 14:55 ` [PATCH v6 07/18] of: dynamic: change type of of_{at,de}tach_node() " Frank Rowand 2018-11-07 14:55 ` Frank Rowand 2018-11-07 23:48 ` Michael Ellerman 2018-11-07 23:48 ` [PATCH v6 07/18] of: dynamic: change type of of_{at, de}tach_node() " Michael Ellerman 2018-11-05 15:25 ` [PATCH v6 08/18] of: overlay: reorder fields in struct fragment frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` frowand.list [this message] 2018-11-05 15:25 ` [PATCH v6 09/18] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list 2018-11-05 15:25 ` [PATCH v6 10/18] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 11/18] of: overlay: test case of two fragments adding same node frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 12/18] of: overlay: check prevents multiple fragments add or delete " frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 13/18] of: overlay: check prevents multiple fragments touching same property frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 14/18] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 15/18] of: overlay: set node fields from properties when add new overlay node frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 16/18] of: unittest: allow base devicetree to have symbol metadata frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 17/18] of: unittest: find overlays[] entry by name instead of index frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 15:25 ` [PATCH v6 18/18] of: unittest: initialize args before calling of_*parse_*() frowand.list 2018-11-05 15:25 ` frowand.list 2018-11-05 19:24 ` [PATCH v6 00/18] of: overlay: validation checks, subsequent fixes Rob Herring 2018-11-05 19:24 ` Rob Herring 2018-11-05 21:55 ` Frank Rowand 2018-11-05 21:55 ` Frank Rowand 2018-11-07 12:09 ` Michael Ellerman 2018-11-07 12:09 ` Michael Ellerman 2018-11-07 12:09 ` Michael Ellerman 2018-11-07 14:59 ` Frank Rowand 2018-11-07 14:59 ` Frank Rowand
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1541431515-25197-10-git-send-email-frowand.list@gmail.com \ --to=frowand.list@gmail.com \ --cc=atull@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-fpga@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mdf@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=pantelis.antoniou@konsulko.com \ --cc=paulus@samba.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.