diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-12-29 11:07:50 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 01:09:51 (GMT) |
| commit | f6740c1899d2ee2c4c9ec5301d4b712d4e706a79 (patch) | |
| tree | b4068aff9f3ff449508a4f27ae8e7625b4bc20bf | |
| parent | 0fb5902f2f9ec7996a0846087f3e69165ea9ce1e (diff) | |
| download | linux-f6740c1899d2ee2c4c9ec5301d4b712d4e706a79.tar.xz | |
device property: avoid allocations of 0 length
Arrays can not have zero elements by definition of the unified device
properties. If such property comes from outside we should not allow it to pass.
Otherwise memory allocation on 0 length will return non-NULL value, which we
currently don't check.
Prevent memory allocations of 0 length.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/base/property.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c index b3429cc..c359351 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -653,6 +653,9 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode, if (nval < 0) return nval; + if (nval == 0) + return -ENODATA; + values = kcalloc(nval, sizeof(*values), GFP_KERNEL); if (!values) return -ENOMEM; @@ -718,6 +721,9 @@ static int pset_copy_entry(struct property_entry *dst, return -ENOMEM; if (src->is_array) { + if (!src->length) + return -ENODATA; + if (src->is_string) { nval = src->length / sizeof(const char *); dst->pointer.str = kcalloc(nval, sizeof(const char *), |