[PATCH] param: add error check to __dev_add_param()

[PATCH] param: add error check to __dev_add_param()

[Masahiro Yamada]

If the argument, name is given with NULL, it would be probably
unexpected behavior.  It should fail rather than register the
NULL-named parameter.

If strdup() fails with out-of-memory, it should also fail
with -ENOMEM.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 lib/parameter.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/parameter.c b/lib/parameter.c
index 71262c4..c658538 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -130,6 +130,13 @@ static int __dev_add_param(struct param_d *param, struct device_d *dev, const ch
 	if (get_param_by_name(dev, name))
 		return -EEXIST;
 
+	if (!name)
+		return -EINVAL;
+
+	param->name = strdup(name);
+	if (param->name)
+		return -ENOMEM;
+
 	if (set)
 		param->set = set;
 	else
@@ -139,7 +146,6 @@ static int __dev_add_param(struct param_d *param, struct device_d *dev, const ch
 	else
 		param->get = param_get_generic;
 
-	param->name = strdup(name);
 	param->flags = flags;
 	param->dev = dev;
 	list_add_tail(&param->list, &dev->parameters);
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] param: add error check to __dev_add_param()

[Sascha Hauer]

On Thu, Jan 29, 2015 at 11:42:36AM +0900, Masahiro Yamada wrote:
> If the argument, name is given with NULL, it would be probably
> unexpected behavior.  It should fail rather than register the
> NULL-named parameter.
> 
> If strdup() fails with out-of-memory, it should also fail
> with -ENOMEM.

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] param: add error check to __dev_add_param()

[Masahiro Yamada]

Hi Sascha,

On Thu, 29 Jan 2015 09:56:23 +0100
Sascha Hauer <s.hauer@pengutronix.de> wrote:

> On Thu, Jan 29, 2015 at 11:42:36AM +0900, Masahiro Yamada wrote:
> > If the argument, name is given with NULL, it would be probably
> > unexpected behavior.  It should fail rather than register the
> > NULL-named parameter.
> > 
> > If strdup() fails with out-of-memory, it should also fail
> > with -ENOMEM.
> 
> Applied, thanks
> 
> Sascha

Uh, this has been superseded by v2.



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox