mtd: cmdlinepart: revise error handling

This patch revises and fixes error handling in the command line mtd partitions parser. Namely: 1. we ignored return code of 'mtdpart_setup_real()'. 2. instead of returning 0 for failure and 1 for success, teach 'mtdpart_setup_real()' to return real error codes. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

mtd: cmdlinepart: revise error handling
This patch revises and fixes error handling in the command line mtd partitions parser. Namely: 1. we ignored return code of 'mtdpart_setup_real()'. 2. instead of returning 0 for failure and 1 for success, teach 'mtdpart_setup_real()' to return real error codes. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Artem Bityutskiy · David Woodhouse
1 parent 3cf7f1314e
Showing 1 changed file with 18 additions and 16 deletions Side-by-side Diff
drivers/mtd/cmdlinepart.c
@@ -39,11 +39,10 @@
  
 #include <linux/kernel.h>
 #include <linux/slab.h>
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
+#include <linux/err.h>
  
 /* error message prefix */
 #define ERRP "mtd: "
@@ -110,7 +109,7 @@
 		if (size < PAGE_SIZE)
 		{
 			printk(KERN_ERR ERRP "partition size too small (%lx)\n", size);
-			return NULL;
+			return ERR_PTR(-EINVAL);
 		}
 	}
  
@@ -138,7 +137,7 @@
 		if (!p)
 		{
 			printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
-			return NULL;
+			return ERR_PTR(-EINVAL);
 		}
 		name_len = p - name;
 		s = p + 1;
  
@@ -172,13 +171,13 @@
 		if (size == SIZE_REMAINING)
 		{
 			printk(KERN_ERR ERRP "no partitions allowed after a fill-up partition\n");
-			return NULL;
+			return ERR_PTR(-EINVAL);
 		}
 		/* more partitions follow, parse them */
 		parts = newpart(s + 1, &s, num_parts, this_part + 1,
 				&extra_mem, extra_mem_size);
-		if (!parts)
-			return NULL;
+		if (IS_ERR(parts))
+			return parts;
 	}
 	else
 	{	/* this is the last partition: allocate space for all */
@@ -189,7 +188,7 @@
 			     extra_mem_size;
 		parts = kzalloc(alloc_size, GFP_KERNEL);
 		if (!parts)
-			return NULL;
+			return ERR_PTR(-ENOMEM);
 		extra_mem = (unsigned char *)(parts + *num_parts);
 	}
 	/* enter this partition (offset will be calculated later if it is zero at this point) */
@@ -245,7 +244,7 @@
 		if (!(p = strchr(s, ':')))
 		{
 			printk(KERN_ERR ERRP "no mtd-id\n");
-			return 0;
+			return -EINVAL;
 		}
 		mtd_id_len = p - mtd_id;
  
@@ -262,7 +261,7 @@
 				(unsigned char**)&this_mtd, /* out: extra mem */
 				mtd_id_len + 1 + sizeof(*this_mtd) +
 				sizeof(void*)-1 /*alignment*/);
-		if(!parts)
+		if (IS_ERR(parts))
 		{
 			/*
 			 * An error occurred. We're either:
@@ -271,7 +270,7 @@
 			 * Either way, this mtd is hosed and we're
 			 * unlikely to succeed in parsing any more
 			 */
-			 return 0;
+			 return PTR_ERR(parts);
 		 }
  
 		/* align this_mtd */
  
@@ -299,11 +298,11 @@
 		if (*s != ';')
 		{
 			printk(KERN_ERR ERRP "bad character after partition (%c)\n", *s);
-			return 0;
+			return -EINVAL;
 		}
 		s++;
 	}
-	return 1;
+	return 0;
 }
  
 /*
  
@@ -318,13 +317,16 @@
 				    struct mtd_part_parser_data *data)
 {
 	unsigned long offset;
-	int i;
+	int i, err;
 	struct cmdline_mtd_partition *part;
 	const char *mtd_id = master->name;
  
 	/* parse command line */
-	if (!cmdline_parsed)
-		mtdpart_setup_real(cmdline);
+	if (!cmdline_parsed) {
+		err = mtdpart_setup_real(cmdline);
+		if (err)
+			return err;
+	}
  
 	for(part = partitions; part; part = part->next)
 	{
...	...	@@ -39,11 +39,10 @@
39	39
40	40	#include <linux/kernel.h>
41	41	#include <linux/slab.h>
42		-
43	42	#include <linux/mtd/mtd.h>
44	43	#include <linux/mtd/partitions.h>
45		-#include <linux/bootmem.h>
46	44	#include <linux/module.h>
	45	+#include <linux/err.h>
47	46
48	47	/* error message prefix */
49	48	#define ERRP "mtd: "
...	...	@@ -110,7 +109,7 @@
110	109	if (size < PAGE_SIZE)
111	110	{
112	111	printk(KERN_ERR ERRP "partition size too small (%lx)\n", size);
113		- return NULL;
	112	+ return ERR_PTR(-EINVAL);
114	113	}
115	114	}
116	115
...	...	@@ -138,7 +137,7 @@
138	137	if (!p)
139	138	{
140	139	printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
141		- return NULL;
	140	+ return ERR_PTR(-EINVAL);
142	141	}
143	142	name_len = p - name;
144	143	s = p + 1;
145	144
...	...	@@ -172,13 +171,13 @@
172	171	if (size == SIZE_REMAINING)
173	172	{
174	173	printk(KERN_ERR ERRP "no partitions allowed after a fill-up partition\n");
175		- return NULL;
	174	+ return ERR_PTR(-EINVAL);
176	175	}
177	176	/* more partitions follow, parse them */
178	177	parts = newpart(s + 1, &s, num_parts, this_part + 1,
179	178	&extra_mem, extra_mem_size);
180		- if (!parts)
181		- return NULL;
	179	+ if (IS_ERR(parts))
	180	+ return parts;
182	181	}
183	182	else
184	183	{ /* this is the last partition: allocate space for all */
...	...	@@ -189,7 +188,7 @@
189	188	extra_mem_size;
190	189	parts = kzalloc(alloc_size, GFP_KERNEL);
191	190	if (!parts)
192		- return NULL;
	191	+ return ERR_PTR(-ENOMEM);
193	192	extra_mem = (unsigned char )(parts + num_parts);
194	193	}
195	194	/* enter this partition (offset will be calculated later if it is zero at this point) */
...	...	@@ -245,7 +244,7 @@
245	244	if (!(p = strchr(s, ':')))
246	245	{
247	246	printk(KERN_ERR ERRP "no mtd-id\n");
248		- return 0;
	247	+ return -EINVAL;
249	248	}
250	249	mtd_id_len = p - mtd_id;
251	250
...	...	@@ -262,7 +261,7 @@
262	261	(unsigned char*)&this_mtd, / out: extra mem */
263	262	mtd_id_len + 1 + sizeof(*this_mtd) +
264	263	sizeof(void)-1 /alignment*/);
265		- if(!parts)
	264	+ if (IS_ERR(parts))
266	265	{
267	266	/*
268	267	* An error occurred. We're either:
...	...	@@ -271,7 +270,7 @@
271	270	* Either way, this mtd is hosed and we're
272	271	* unlikely to succeed in parsing any more
273	272	*/
274		- return 0;
	273	+ return PTR_ERR(parts);
275	274	}
276	275
277	276	/* align this_mtd */
278	277
...	...	@@ -299,11 +298,11 @@
299	298	if (*s != ';')
300	299	{
301	300	printk(KERN_ERR ERRP "bad character after partition (%c)\n", *s);
302		- return 0;
	301	+ return -EINVAL;
303	302	}
304	303	s++;
305	304	}
306		- return 1;
	305	+ return 0;
307	306	}
308	307
309	308	/*
310	309
...	...	@@ -318,13 +317,16 @@
318	317	struct mtd_part_parser_data *data)
319	318	{
320	319	unsigned long offset;
321		- int i;
	320	+ int i, err;
322	321	struct cmdline_mtd_partition *part;
323	322	const char *mtd_id = master->name;
324	323
325	324	/* parse command line */
326		- if (!cmdline_parsed)
327		- mtdpart_setup_real(cmdline);
	325	+ if (!cmdline_parsed) {
	326	+ err = mtdpart_setup_real(cmdline);
	327	+ if (err)
	328	+ return err;
	329	+ }
328	330
329	331	for(part = partitions; part; part = part->next)
330	332	{