| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220620104123.341054-4-clement.leger@bootlin.com>
Date: Mon, 20 Jun 2022 12:41:21 +0200
From: Clément Léger <clement.leger@...tlin.com>
To: Michael Ellerman <mpe@...erman.id.au>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Rob Herring <robh+dt@...nel.org>,
Frank Rowand <frowand.list@...il.com>,
Nathan Lynch <nathanl@...ux.ibm.com>,
Laurent Dufour <ldufour@...ux.ibm.com>,
Daniel Henrique Barboza <danielhb413@...il.com>,
David Gibson <david@...son.dropbear.id.au>,
Andrew Morton <akpm@...ux-foundation.org>,
David Hildenbrand <david@...hat.com>,
Ohhoon Kwon <ohoono.kwon@...sung.com>,
"Aneesh Kumar K.V" <aneesh.kumar@...ux.ibm.com>,
YueHaibing <yuehaibing@...wei.com>
Cc: Clément Léger <clement.leger@...tlin.com>,
linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
devicetree@...r.kernel.org,
Allan Nielsen <allan.nielsen@...rochip.com>,
Horatiu Vultur <horatiu.vultur@...rochip.com>,
Steen Hegelund <steen.hegelund@...rochip.com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
Bjorn Helgaas <helgaas@...nel.org>,
Lizhi Hou <lizhi.hou@...inx.com>
Subject: [PATCH v3 3/5] of: dynamic: add of_property_alloc() and of_property_free()
Add function which allows to dynamically allocate and free properties.
Use this function internally for all code that used the same logic.
Signed-off-by: Clément Léger <clement.leger@...tlin.com>
---
drivers/of/dynamic.c | 83 ++++++++++++++++++++++++-----------------
drivers/of/of_private.h | 19 +++++++++-
drivers/of/unittest.c | 8 +---
include/linux/of.h | 14 +++++++
4 files changed, 83 insertions(+), 41 deletions(-)
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 5560e501aedf..9e29000571d1 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -313,9 +313,7 @@ static void property_list_free(struct property *prop_list)
for (prop = prop_list; prop != NULL; prop = next) {
next = prop->next;
- kfree(prop->name);
- kfree(prop->value);
- kfree(prop);
+ of_property_free(prop);
}
}
@@ -367,47 +365,66 @@ void of_node_release(struct kobject *kobj)
}
/**
- * __of_prop_dup - Copy a property dynamically.
- * @prop: Property to copy
+ * of_property_free - Free a property allocated dynamically.
+ * @prop: Property to be freed
+ */
+void of_property_free(const struct property *prop)
+{
+ if (!of_property_check_flag(prop, OF_DYNAMIC))
+ return;
+
+ if (prop->value != prop + 1)
+ kfree(prop->value);
+
+ kfree(prop->name);
+ kfree(prop);
+}
+EXPORT_SYMBOL(of_property_free);
+
+/**
+ * of_property_alloc - Allocate a property dynamically.
+ * @name: Name of the new property
+ * @value: Value that will be copied into the new property value or NULL
+ * if only @len allocation is needed.
+ * @len: Length of new property value and if @value is provided, the
+ * length of the value to be copied
*
- * Copy a property by dynamically allocating the memory of both the
+ * Create a property by dynamically allocating the memory of both the
* property structure and the property name & contents. The property's
* flags have the OF_DYNAMIC bit set so that we can differentiate between
* dynamically allocated properties and not.
*
* Return: The newly allocated property or NULL on out of memory error.
*/
-struct property *__of_prop_dup(const struct property *prop)
+
+struct property *of_property_alloc(const char *name, const void *value,
+ size_t len)
{
- struct property *new;
+ struct property *prop;
- new = kzalloc(sizeof(*new), GFP_KERNEL);
- if (!new)
+ prop = kzalloc(sizeof(*prop) + len, GFP_KERNEL);
+ if (!prop)
return NULL;
- /*
- * NOTE: There is no check for zero length value.
- * In case of a boolean property, this will allocate a value
- * of zero bytes. We do this to work around the use
- * of of_get_property() calls on boolean values.
- */
- new->name = kstrdup(prop->name, GFP_KERNEL);
- new->value = kmemdup(prop->value, prop->length, GFP_KERNEL);
- new->length = prop->length;
- if (!new->name || !new->value)
- goto err_free;
-
- /* mark the property as dynamic */
- of_property_set_flag(new, OF_DYNAMIC);
-
- return new;
-
- err_free:
- kfree(new->name);
- kfree(new->value);
- kfree(new);
+ prop->name = kstrdup(name, GFP_KERNEL);
+ if (!prop->name)
+ goto out_err;
+
+ prop->value = prop + 1;
+ if (value)
+ memcpy(prop->value, value, len);
+
+ prop->length = len;
+ of_property_set_flag(prop, OF_DYNAMIC);
+
+ return prop;
+
+out_err:
+ of_property_free(prop);
+
return NULL;
}
+EXPORT_SYMBOL(of_property_alloc);
/**
* __of_node_dup() - Duplicate or create an empty device node dynamically.
@@ -446,9 +463,7 @@ struct device_node *__of_node_dup(const struct device_node *np,
if (!new_pp)
goto err_prop;
if (__of_add_property(node, new_pp)) {
- kfree(new_pp->name);
- kfree(new_pp->value);
- kfree(new_pp);
+ of_property_free(new_pp);
goto err_prop;
}
}
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index e319d8c2bf8b..7bed5a4a8033 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -115,7 +115,24 @@ extern void *__unflatten_device_tree(const void *blob,
* without taking node references, so you either have to
* own the devtree lock or work on detached trees only.
*/
-struct property *__of_prop_dup(const struct property *prop);
+
+/**
+ * __of_prop_dup - Copy a property dynamically.
+ * @prop: Property to copy
+ *
+ * Copy a property by dynamically allocating the memory of both the
+ * property structure and the property name & contents. The property's
+ * flags have the OF_DYNAMIC bit set so that we can differentiate between
+ * dynamically allocated properties and not.
+ *
+ * Return: The newly allocated property or NULL on out of memory error.
+ */
+static inline
+struct property *__of_prop_dup(const struct property *prop)
+{
+ return of_property_alloc(prop->name, prop->value, prop->length);
+}
+
struct device_node *__of_node_dup(const struct device_node *np,
const char *full_name);
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 23ccb74ef408..789ed9f46e3c 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -774,15 +774,11 @@ static void __init of_unittest_property_copy(void)
new = __of_prop_dup(&p1);
unittest(new && propcmp(&p1, new), "empty property didn't copy correctly\n");
- kfree(new->value);
- kfree(new->name);
- kfree(new);
+ of_property_free(new);
new = __of_prop_dup(&p2);
unittest(new && propcmp(&p2, new), "non-empty property didn't copy correctly\n");
- kfree(new->value);
- kfree(new->name);
- kfree(new);
+ of_property_free(new);
#endif
}
diff --git a/include/linux/of.h b/include/linux/of.h
index d74fd82a6963..157248a77c4e 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1464,6 +1464,10 @@ enum of_reconfig_change {
};
#ifdef CONFIG_OF_DYNAMIC
+struct property *of_property_alloc(const char *name, const void *value,
+ size_t len);
+void of_property_free(const struct property *prop);
+
extern int of_reconfig_notifier_register(struct notifier_block *);
extern int of_reconfig_notifier_unregister(struct notifier_block *);
extern int of_reconfig_notify(unsigned long, struct of_reconfig_data *rd);
@@ -1508,6 +1512,16 @@ static inline int of_changeset_update_property(struct of_changeset *ocs,
return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop);
}
#else /* CONFIG_OF_DYNAMIC */
+
+static inline
+struct property *of_property_alloc(const char *name, const void *value,
+ size_t len)
+{
+ return NULL;
+}
+
+static inline void of_property_free(const struct property *prop) {}
+
static inline int of_reconfig_notifier_register(struct notifier_block *nb)
{
return -EINVAL;
--
2.36.1
Powered by blists - more mailing lists