summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 15:05:37 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-01 08:39:15 +0200
commit01ed1ab7b5966f535a6844eb31a882700e1a9784 (patch)
tree901473e967f5aadc20b90530cd50bb380f0e11a8
parenta3abbad9be8f238aeea5a082bd5538d22afae834 (diff)
downloadbarebox-01ed1ab7b5966f535a6844eb31a882700e1a9784.tar.gz
of_partition: devfs_add_partition returns an error pointer
Check for the return value of devfs_add_partition with IS_ERR. Otherwise we dereference a NULL pointer when devfs_add_partition fails. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/of/partition.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/partition.c b/drivers/of/partition.c
index e2ddec5..3dce844 100644
--- a/drivers/of/partition.c
+++ b/drivers/of/partition.c
@@ -21,6 +21,7 @@
#include <of.h>
#include <malloc.h>
#include <linux/mtd/mtd.h>
+#include <linux/err.h>
#include <nand.h>
struct cdev *of_parse_partition(struct cdev *cdev, struct device_node *node)
@@ -60,6 +61,9 @@ struct cdev *of_parse_partition(struct cdev *cdev, struct device_node *node)
filename = asprintf("%s.%s", cdev->name, partname);
new = devfs_add_partition(cdev->name, offset, size, flags, filename);
+ if (IS_ERR(new))
+ new = NULL;
+
if (new && new->dev)
new->dev->device_node = node;