summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeorgi Djakov <georgi.djakov@linaro.org>2020-02-26 12:04:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-03 08:02:57 +0100
commit3791163602f7140011a8dc1691cfe6ec0cb1ef07 (patch)
treeec3e52e893fb9cec4b5f13f3df3b7b39c86b0f8f /drivers
parentaltera-stapl: altera_get_note: prevent write beyond end of 'key' (diff)
downloadlinux-3791163602f7140011a8dc1691cfe6ec0cb1ef07.tar.xz
linux-3791163602f7140011a8dc1691cfe6ec0cb1ef07.zip
interconnect: Handle memory allocation errors
When we allocate memory, kasprintf() can fail and we must check its return value. Fixes: 05309830e1f8 ("interconnect: Add a name to struct icc_path") Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> Link: https://lore.kernel.org/r/20200226110420.5357-2-georgi.djakov@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/interconnect/core.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index f277e467156f..2c6515e3ecf1 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -445,6 +445,11 @@ struct icc_path *of_icc_get(struct device *dev, const char *name)
path->name = kasprintf(GFP_KERNEL, "%s-%s",
src_node->name, dst_node->name);
+ if (!path->name) {
+ kfree(path);
+ return ERR_PTR(-ENOMEM);
+ }
+
return path;
}
EXPORT_SYMBOL_GPL(of_icc_get);
@@ -579,6 +584,10 @@ struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id)
}
path->name = kasprintf(GFP_KERNEL, "%s-%s", src->name, dst->name);
+ if (!path->name) {
+ kfree(path);
+ path = ERR_PTR(-ENOMEM);
+ }
out:
mutex_unlock(&icc_lock);
return path;