| From f14bd0ae74bbe9547ca51f03a3bcabf0ad9685db Mon Sep 17 00:00:00 2001 |
| From: Robert Richter <rrichter@marvell.com> |
| Date: Wed, 12 Feb 2020 13:03:39 +0100 |
| Subject: [PATCH] EDAC/sysfs: Remove csrow objects on errors |
| |
| commit 4d59588c09f2a2daedad2a544d4d1b602ab3a8af upstream. |
| |
| All created csrow objects must be removed in the error path of |
| edac_create_csrow_objects(). The objects have been added as devices. |
| |
| They need to be removed by doing a device_del() *and* put_device() call |
| to also free their memory. The missing put_device() leaves a memory |
| leak. Use device_unregister() instead of device_del() which properly |
| unregisters the device doing both. |
| |
| Fixes: 7adc05d2dc3a ("EDAC/sysfs: Drop device references properly") |
| Signed-off-by: Robert Richter <rrichter@marvell.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Tested-by: John Garry <john.garry@huawei.com> |
| Cc: <stable@vger.kernel.org> |
| Link: https://lkml.kernel.org/r/20200212120340.4764-4-rrichter@marvell.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c |
| index 4386ea4b9b5a..9f589acd0753 100644 |
| --- a/drivers/edac/edac_mc_sysfs.c |
| +++ b/drivers/edac/edac_mc_sysfs.c |
| @@ -449,8 +449,7 @@ static int edac_create_csrow_objects(struct mem_ctl_info *mci) |
| csrow = mci->csrows[i]; |
| if (!nr_pages_per_csrow(csrow)) |
| continue; |
| - |
| - device_del(&mci->csrows[i]->dev); |
| + device_unregister(&mci->csrows[i]->dev); |
| } |
| |
| return err; |
| -- |
| 2.7.4 |
| |
