EDAC: Fix the leak of mci->bus->name when bus_register fails

Also use goto labels for all failure paths in edac_create_sysfs_mci_device and update meaningless labels. Signed-off-by: Junjie Mao <junjie.mao@hotmail.com> Link: http://lkml.kernel.org/r/BLU436-SMTP25291B6B612942A212AEBFE95300@phx.gbl [ Boris: Use ! for 0 checks and add newlines for less crammed code. ] Signed-off-by: Borislav Petkov <bp@suse.de>
author: Junjie Mao <junjie.mao@hotmail.com> 2015-01-28 20:13:55 -0500
committer: Borislav Petkov <bp@suse.de> 2015-01-30 08:38:45 -0500
commit: 1bf1950c4e3ab6f8dad6b1b8c609de4eccb095a8 (patch)
tree: 7360f7d5502df26c15ff9e6bbca1fb62f0f779e0 /drivers/edac/edac_mc_sysfs.c
parent: a4972b1b9a04439c2dc15a98b333ed28378d3509 (diff)
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 670d2829c547..7952d25d0909 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -989,7 +989,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
        err = bus_register(mci->bus);
        if (err < 0)
-                return err;
+                goto fail_free_name;
        /* get the /sys/devices/system/edac subsys reference */
        mci->dev.type = &mci_attr_type;
@@ -1005,9 +1005,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
        err = device_add(&mci->dev);
        if (err < 0) {
                edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev));
-                bus_unregister(mci->bus);
+                goto fail_unregister_bus;
-                kfree(mci->bus->name);
-                return err;
        }
        if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
@@ -1015,15 +1013,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
                        dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
                        dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
                }
                if (mci->set_sdram_scrub_rate) {
                        dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
                        dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
                }
-                err = device_create_file(&mci->dev,
-                                         &dev_attr_sdram_scrub_rate);
+                err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
                if (err) {
                        edac_dbg(1, "failure: create sdram_scrub_rate\n");
-                        goto fail2;
+                        goto fail_unregister_dev;
                }
        }
        /*
@@ -1032,8 +1031,9 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
        for (i = 0; i < mci->tot_dimms; i++) {
                struct dimm_info *dimm = mci->dimms[i];
                /* Only expose populated DIMMs */
-                if (dimm->nr_pages == 0)
+                if (!dimm->nr_pages)
                        continue;
 #ifdef CONFIG_EDAC_DEBUG
                edac_dbg(1, "creating dimm%d, located at ", i);
                if (edac_debug_level >= 1) {
@@ -1048,14 +1048,14 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
                err = edac_create_dimm_object(mci, dimm, i);
                if (err) {
                        edac_dbg(1, "failure: create dimm %d obj\n", i);
-                        goto fail;
+                        goto fail_unregister_dimm;
                }
        }
 #ifdef CONFIG_EDAC_LEGACY_SYSFS
        err = edac_create_csrow_objects(mci);
        if (err < 0)
-                goto fail;
+                goto fail_unregister_dimm;
 #endif
 #ifdef CONFIG_EDAC_DEBUG
@@ -1063,16 +1063,19 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 #endif
        return 0;
-fail:
+fail_unregister_dimm:
        for (i--; i >= 0; i--) {
                struct dimm_info *dimm = mci->dimms[i];
-                if (dimm->nr_pages == 0)
+                if (!dimm->nr_pages)
                        continue;
                device_unregister(&dimm->dev);
        }
-fail2:
+fail_unregister_dev:
        device_unregister(&mci->dev);
+fail_unregister_bus:
        bus_unregister(mci->bus);
+fail_free_name:
        kfree(mci->bus->name);
        return err;
 }
author	Junjie Mao <junjie.mao@hotmail.com>	2015-01-28 20:13:55 -0500
committer	Borislav Petkov <bp@suse.de>	2015-01-30 08:38:45 -0500
commit	1bf1950c4e3ab6f8dad6b1b8c609de4eccb095a8 (patch)
tree	7360f7d5502df26c15ff9e6bbca1fb62f0f779e0 /drivers/edac/edac_mc_sysfs.c
parent	a4972b1b9a04439c2dc15a98b333ed28378d3509 (diff)

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 670d2829c547..7952d25d0909 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c
@@ -989,7 +989,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
989		989
990	err = bus_register(mci->bus);	990	err = bus_register(mci->bus);
991	if (err < 0)	991	if (err < 0)
992	return err;	992	goto fail_free_name;
993		993
994	/* get the /sys/devices/system/edac subsys reference */	994	/* get the /sys/devices/system/edac subsys reference */
995	mci->dev.type = &mci_attr_type;	995	mci->dev.type = &mci_attr_type;
@@ -1005,9 +1005,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1005	err = device_add(&mci->dev);	1005	err = device_add(&mci->dev);
1006	if (err < 0) {	1006	if (err < 0) {
1007	edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev));	1007	edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev));
1008	bus_unregister(mci->bus);	1008	goto fail_unregister_bus;
1009	kfree(mci->bus->name);
1010	return err;
1011	}	1009	}
1012		1010
1013	if (mci->set_sdram_scrub_rate \|\| mci->get_sdram_scrub_rate) {	1011	if (mci->set_sdram_scrub_rate \|\| mci->get_sdram_scrub_rate) {
@@ -1015,15 +1013,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1015	dev_attr_sdram_scrub_rate.attr.mode \|= S_IRUGO;	1013	dev_attr_sdram_scrub_rate.attr.mode \|= S_IRUGO;
1016	dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;	1014	dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
1017	}	1015	}
		1016
1018	if (mci->set_sdram_scrub_rate) {	1017	if (mci->set_sdram_scrub_rate) {
1019	dev_attr_sdram_scrub_rate.attr.mode \|= S_IWUSR;	1018	dev_attr_sdram_scrub_rate.attr.mode \|= S_IWUSR;
1020	dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;	1019	dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
1021	}	1020	}
1022	err = device_create_file(&mci->dev,	1021
1023	&dev_attr_sdram_scrub_rate);	1022	err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
1024	if (err) {	1023	if (err) {
1025	edac_dbg(1, "failure: create sdram_scrub_rate\n");	1024	edac_dbg(1, "failure: create sdram_scrub_rate\n");
1026	goto fail2;	1025	goto fail_unregister_dev;
1027	}	1026	}
1028	}	1027	}
1029	/*	1028	/*
@@ -1032,8 +1031,9 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1032	for (i = 0; i < mci->tot_dimms; i++) {	1031	for (i = 0; i < mci->tot_dimms; i++) {
1033	struct dimm_info *dimm = mci->dimms[i];	1032	struct dimm_info *dimm = mci->dimms[i];
1034	/* Only expose populated DIMMs */	1033	/* Only expose populated DIMMs */
1035	if (dimm->nr_pages == 0)	1034	if (!dimm->nr_pages)
1036	continue;	1035	continue;
		1036
1037	#ifdef CONFIG_EDAC_DEBUG	1037	#ifdef CONFIG_EDAC_DEBUG
1038	edac_dbg(1, "creating dimm%d, located at ", i);	1038	edac_dbg(1, "creating dimm%d, located at ", i);
1039	if (edac_debug_level >= 1) {	1039	if (edac_debug_level >= 1) {
@@ -1048,14 +1048,14 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1048	err = edac_create_dimm_object(mci, dimm, i);	1048	err = edac_create_dimm_object(mci, dimm, i);
1049	if (err) {	1049	if (err) {
1050	edac_dbg(1, "failure: create dimm %d obj\n", i);	1050	edac_dbg(1, "failure: create dimm %d obj\n", i);
1051	goto fail;	1051	goto fail_unregister_dimm;
1052	}	1052	}
1053	}	1053	}
1054		1054
1055	#ifdef CONFIG_EDAC_LEGACY_SYSFS	1055	#ifdef CONFIG_EDAC_LEGACY_SYSFS
1056	err = edac_create_csrow_objects(mci);	1056	err = edac_create_csrow_objects(mci);
1057	if (err < 0)	1057	if (err < 0)
1058	goto fail;	1058	goto fail_unregister_dimm;
1059	#endif	1059	#endif
1060		1060
1061	#ifdef CONFIG_EDAC_DEBUG	1061	#ifdef CONFIG_EDAC_DEBUG
@@ -1063,16 +1063,19 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1063	#endif	1063	#endif
1064	return 0;	1064	return 0;
1065		1065
1066	fail:	1066	fail_unregister_dimm:
1067	for (i--; i >= 0; i--) {	1067	for (i--; i >= 0; i--) {
1068	struct dimm_info *dimm = mci->dimms[i];	1068	struct dimm_info *dimm = mci->dimms[i];
1069	if (dimm->nr_pages == 0)	1069	if (!dimm->nr_pages)
1070	continue;	1070	continue;
		1071
1071	device_unregister(&dimm->dev);	1072	device_unregister(&dimm->dev);
1072	}	1073	}
1073	fail2:	1074	fail_unregister_dev:
1074	device_unregister(&mci->dev);	1075	device_unregister(&mci->dev);
		1076	fail_unregister_bus:
1075	bus_unregister(mci->bus);	1077	bus_unregister(mci->bus);
		1078	fail_free_name:
1076	kfree(mci->bus->name);	1079	kfree(mci->bus->name);
1077	return err;	1080	return err;
1078	}	1081	}