From: WANG Cong Since kobject_add, sysfs_create_link and sysfs_create_file are marked as '__must_check', we must always check their return values. Signed-off-by: WANG Cong Acked-by: Cornelia Huck Signed-off-by: Andrew Morton --- fs/partitions/check.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff -puN fs/partitions/check.c~partitions-check-the-return-value-of-kobject_add-etc fs/partitions/check.c --- a/fs/partitions/check.c~partitions-check-the-return-value-of-kobject_add-etc +++ a/fs/partitions/check.c @@ -383,26 +383,41 @@ void add_partition(struct gendisk *disk, p->policy = disk->policy; if (isdigit(disk->kobj.name[strlen(disk->kobj.name)-1])) - snprintf(p->kobj.name,KOBJ_NAME_LEN,"%sp%d",disk->kobj.name,part); + snprintf(p->kobj.name, KOBJ_NAME_LEN, "%sp%d", + disk->kobj.name, part); else - snprintf(p->kobj.name,KOBJ_NAME_LEN,"%s%d",disk->kobj.name,part); + snprintf(p->kobj.name, KOBJ_NAME_LEN, "%s%d", + disk->kobj.name, part); p->kobj.parent = &disk->kobj; p->kobj.ktype = &ktype_part; kobject_init(&p->kobj); - kobject_add(&p->kobj); + if (kobject_add(&p->kobj)) + goto out_put; if (!disk->part_uevent_suppress) kobject_uevent(&p->kobj, KOBJ_ADD); - sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem"); + if (sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem")) + goto out_uevent; if (flags & ADDPART_FLAG_WHOLEDISK) { static struct attribute addpartattr = { .name = "whole_disk", .mode = S_IRUSR | S_IRGRP | S_IROTH, }; - sysfs_create_file(&p->kobj, &addpartattr); + if (sysfs_create_file(&p->kobj, &addpartattr)) + goto out_link; } partition_sysfs_add_subdir(p); disk->part[part-1] = p; + return; + +out_link: + sysfs_remove_link(&p->kobj, "subsystem"); +out_uevent: + if (!disk->part_uevent_suppress) + kobject_uevent(&p->kobj, KOBJ_REMOVE); + kobject_del(&p->kobj); +out_put: + kobject_put(&p->kobj); } static char *make_block_name(struct gendisk *disk) _