lkml.org 
[lkml]   [2013]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] driver-core: only call kfree() if memory was allocated
Date
There are several cases where we could bail out of show_uevent()
before kzalloc() is even called. In those cases we don't want to
call kfree().

In addition the error handling of kzalloc() is now using the
single point of exit as well.

Signed-off-by: Andreas Platschek <andi.platschek@gmail.com>
---
drivers/base/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 8856d74..bf4effb 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -372,8 +372,10 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
goto out;

env = kzalloc(sizeof(struct kobj_uevent_env), GFP_KERNEL);
- if (!env)
- return -ENOMEM;
+ if (!env) {
+ count = -ENOMEM;
+ goto out;
+ }

/* let the kset specific function add its keys */
retval = kset->uevent_ops->uevent(kset, &dev->kobj, env);
@@ -383,8 +385,9 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
/* copy keys to file */
for (i = 0; i < env->envp_idx; i++)
count += sprintf(&buf[count], "%s\n", env->envp[i]);
-out:
+out_free:
kfree(env);
+out:
return count;
}

--
1.7.10.4


\
 
 \ /
  Last update: 2013-08-03 00:01    [W:0.031 / U:0.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site