From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp.mei.co.jp ([133.183.100.20]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YGf8Z-0002pG-4g for barebox@lists.infradead.org; Thu, 29 Jan 2015 02:47:19 +0000 Received: from mail-gw.jp.panasonic.com ([157.8.1.157]) by smtp.mei.co.jp (8.12.11.20060614/3.7W/kc-maile12) with ESMTP id t0T2kuAj004658 for ; Thu, 29 Jan 2015 11:46:56 +0900 (JST) Received: from epochmail.jp.panasonic.com ([157.8.1.130]) by mail.jp.panasonic.com (8.11.6p2/3.7W/kc-maili11) with ESMTP id t0T2kvi17750 for ; Thu, 29 Jan 2015 11:46:57 +0900 From: Masahiro Yamada Date: Thu, 29 Jan 2015 11:46:53 +0900 Message-Id: <1422499613-683-1-git-send-email-yamada.m@jp.panasonic.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2] param: add error check to __dev_add_param() To: barebox@lists.infradead.org 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 --- Changes in v2: - Fix the condition of returning -ENOMEM lib/parameter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/parameter.c b/lib/parameter.c index 71262c4..02a89bb 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(¶m->list, &dev->parameters); -- 1.9.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox