Sfoglia il codice sorgente

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>
Andy Shevchenko 10 anni fa
parent
commit
f6740c1899
1 ha cambiato i file con 6 aggiunte e 0 eliminazioni
  1. 6 0
      drivers/base/property.c

+ 6 - 0
drivers/base/property.c

@@ -653,6 +653,9 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
 	if (nval < 0)
 	if (nval < 0)
 		return nval;
 		return nval;
 
 
+	if (nval == 0)
+		return -ENODATA;
+
 	values = kcalloc(nval, sizeof(*values), GFP_KERNEL);
 	values = kcalloc(nval, sizeof(*values), GFP_KERNEL);
 	if (!values)
 	if (!values)
 		return -ENOMEM;
 		return -ENOMEM;
@@ -718,6 +721,9 @@ static int pset_copy_entry(struct property_entry *dst,
 		return -ENOMEM;
 		return -ENOMEM;
 
 
 	if (src->is_array) {
 	if (src->is_array) {
+		if (!src->length)
+			return -ENODATA;
+
 		if (src->is_string) {
 		if (src->is_string) {
 			nval = src->length / sizeof(const char *);
 			nval = src->length / sizeof(const char *);
 			dst->pointer.str = kcalloc(nval, sizeof(const char *),
 			dst->pointer.str = kcalloc(nval, sizeof(const char *),