Skip to contentSkip to conversation

Fix error handling in create_files()

PATCH In review Luca Tettamanti 3 participants 4 messages Oct 9, 2006 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix error handling in create_files()

Hello,
current code in create_files() detects an error iff the last sysfs_add_file fails:

for (attr = grp->attrs; *attr && !error; attr++) {
        error = sysfs_add_file(dir, *attr, SYSFS_KOBJ_ATTR);
}
if (error)
        remove_files(dir,grp);

In order to do the proper cleanup upon failure 'error' must be checked on every iteration.

---
 fs/sysfs/group.c |    2 ++
 1 file changed, 2 insertions(+)
fs/sysfs/group.c +2 -0
index 122145b..1c490d6 100644
@@ -33,6 +33,8 @@ static int create_files(struct dentry * 
 
 	for (attr = grp->attrs; *attr && !error; attr++) {
 		error = sysfs_add_file(dir, *attr, SYSFS_KOBJ_ATTR);
+		if (error)
+			break;
 	}
 	if (error)
 		remove_files(dir,grp);

Luca

Signature · 2 lines
Recursion n.:
	See Recursion.
#1 lore raw
Quoted 4 lines · Luca Tettamanti

Hello,
current code in create_files() detects an error iff the last sysfs_add_file fails:

Quoted 8 lines
for (attr = grp->attrs; *attr && !error; attr++) {
        error = sysfs_add_file(dir, *attr, SYSFS_KOBJ_ATTR);
}
if (error)
        remove_files(dir,grp);

In order to do the proper cleanup upon failure 'error' must be checked on every iteration.

But it is, look up there in the "!error" test, right?

thanks,

greg k-h

#2 lore raw

Il Mon, Oct 09, 2006 at 09:48:20AM -0700, Greg KH ha scritto:

Quoted 11 lines · Luca Tettamanti
Quoted 10 lines

Hello,
current code in create_files() detects an error iff the last sysfs_add_file fails:

for (attr = grp->attrs; *attr && !error; attr++) {
        error = sysfs_add_file(dir, *attr, SYSFS_KOBJ_ATTR);
}
if (error)
        remove_files(dir,grp);
Quoted 4 lines
Quoted 2 lines

In order to do the proper cleanup upon failure 'error' must be checked on every iteration.

But it is, look up there in the "!error" test, right?

Ah, right. I totally missed it.

While we are at it: is it safe to always call sysfs_remove_group even if the preceding sysfs_create_group failed?

(I'm looking at this warning:

arch/i386/kernel/cpu/mcheck/therm_throt.c: In function 'thermal_throttle_add_dev':
arch/i386/kernel/cpu/mcheck/therm_throt.c:115: warning: ignoring return value of
'sysfs_create_group', declared with attribute warn_unused_result
)

Luca

Signature · 1 line
42
#3 lore raw
Quoted 2 lines · Luca Tettamanti

While we are at it: is it safe to always call sysfs_remove_group even if the preceding sysfs_create_group failed?

No, it will oops in remove_dir(). (See also the recent discussion in "drivers/base: error handling fixes" - drivers/base/topology.c has problems in that area as well...)

Signature · 3 lines
Cornelia Huck
Linux for zSeries Developer
Tel.: +49-7031-16-4837, Mail: [email protected]