Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1571823
| From | Dmitry Torokhov <dmitry.torokhov@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 3/4] driver property: constify property arrays values |
| Date | 2017-02-01 18:40 +0100 |
| Message-ID | <t672X-pD-39@gated-at.bofh.it> (permalink) |
| References | <t672W-pD-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Data that is fed into property arrays should not be modified, so let's mark
relevant pointers as const. This will allow us making source arrays as
const/__initconst.
Also fix memory leaks on errors in property_entry_copy().
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/base/property.c | 66 +++++++++++++++++++++++++++++++++---------------
include/linux/property.h | 12 ++++-----
2 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index edc09854520b..8cfbc94cafb1 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -682,44 +682,66 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
}
EXPORT_SYMBOL_GPL(fwnode_property_match_string);
+static int property_copy_string_array(struct property_entry *dst,
+ const struct property_entry *src)
+{
+ char **d;
+ size_t nval = src->length / sizeof(*d);
+ size_t i;
+
+ d = kcalloc(nval, sizeof(*d), GFP_KERNEL);
+ if (!d)
+ return -ENOMEM;
+
+ for (i = 0; i < nval; i++) {
+ d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL);
+ if (!d[i] && src->pointer.str[i]) {
+ while (--i >= 0)
+ kfree(d[i]);
+ kfree(d);
+ return -ENOMEM;
+ }
+ }
+
+ dst->pointer.str = (void *)d;
+ return 0;
+}
+
static int property_entry_copy(struct property_entry *dst,
const struct property_entry *src)
{
- const char **d, **s;
- size_t i, nval;
+ int error;
dst->name = kstrdup(src->name, GFP_KERNEL);
if (!dst->name)
return -ENOMEM;
if (src->is_array) {
- if (!src->length)
- return -ENODATA;
+ if (!src->length) {
+ error = -ENODATA;
+ goto out_free_name;
+ }
if (src->is_string) {
- nval = src->length / sizeof(const char *);
- dst->pointer.str = kcalloc(nval, sizeof(const char *),
- GFP_KERNEL);
- if (!dst->pointer.str)
- return -ENOMEM;
-
- d = dst->pointer.str;
- s = src->pointer.str;
- for (i = 0; i < nval; i++) {
- d[i] = kstrdup(s[i], GFP_KERNEL);
- if (!d[i] && s[i])
- return -ENOMEM;
+ error = property_copy_string_array(dst, src);
+ if (error) {
+ error = -ENOMEM;
+ goto out_free_name;
}
} else {
dst->pointer.raw_data = kmemdup(src->pointer.raw_data,
src->length, GFP_KERNEL);
- if (!dst->pointer.raw_data)
- return -ENOMEM;
+ if (!dst->pointer.raw_data) {
+ error = -ENOMEM;
+ goto out_free_name;
+ }
}
} else if (src->is_string) {
dst->value.str = kstrdup(src->value.str, GFP_KERNEL);
- if (!dst->value.str && src->value.str)
- return -ENOMEM;
+ if (!dst->value.str && src->value.str) {
+ error = -ENOMEM;
+ goto out_free_name;
+ }
} else {
dst->value.raw_data = src->value.raw_data;
}
@@ -729,6 +751,10 @@ static int property_entry_copy(struct property_entry *dst,
dst->is_string = src->is_string;
return 0;
+
+out_free_name:
+ kfree(dst->name);
+ return error;
}
/**
diff --git a/include/linux/property.h b/include/linux/property.h
index 5746e9927016..64e3a9c6d95f 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -160,12 +160,12 @@ struct property_entry {
bool is_string;
union {
union {
- void *raw_data;
- u8 *u8_data;
- u16 *u16_data;
- u32 *u32_data;
- u64 *u64_data;
- const char **str;
+ const void *raw_data;
+ const u8 *u8_data;
+ const u16 *u16_data;
+ const u32 *u32_data;
+ const u64 *u64_data;
+ const char * const *str;
} pointer;
union {
unsigned long long raw_data;
--
2.11.0.483.g087da7b7c-goog
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/4] Export APIs to copy device properties & more Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-01 18:40 +0100
[PATCH v3 3/4] driver property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-01 18:40 +0100
Re: [PATCH v3 3/4] driver property: constify property arrays values Joe Perches <joe@perches.com> - 2017-02-02 00:40 +0100
Re: [PATCH v3 3/4] driver property: constify property arrays values "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-02-02 12:30 +0100
[PATCH v4 3/4] device property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-02 17:40 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-02-02 18:00 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-02 18:10 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-02-02 19:00 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-02 20:00 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values "Rafael J. Wysocki" <rafael@kernel.org> - 2017-02-03 00:20 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-03 01:20 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values "Rafael J. Wysocki" <rafael@kernel.org> - 2017-02-03 01:40 +0100
Re: [PATCH v4 3/4] device property: constify property arrays values Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-03 02:10 +0100
Re: [PATCH v3 3/4] driver property: constify property arrays values Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-02-02 11:10 +0100
[PATCH v3 2/4] device property: allow to constify properties Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-01 18:40 +0100
Re: [PATCH v3 0/4] Export APIs to copy device properties & more Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-02-02 00:00 +0100
csiph-web