linux-kernel - [PATCH] EDAC, mv64x60: Remove some code duplication

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 13 Jan 2018 08:28:21 +0100
From:   Christophe JAILLET <christophe.jaillet@...adoo.fr>
To:     bp@...en8.de, mchehab@...nel.org
Cc:     linux-edac@...r.kernel.org, linux-kernel@...r.kernel.org,
        kernel-janitors@...r.kernel.org,
        Christophe JAILLET <christophe.jaillet@...adoo.fr>
Subject: [PATCH] EDAC, mv64x60: Remove some code duplication

Reorder the error handling code in order to release the resources in
reverse order than allocation.

Introduce a new 'release_group' label in the error handling path and use
it to void some code duplication.

Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
---
 drivers/edac/mv64x60_edac.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 3c68bb525d5d..aa5bc1d8f424 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -450,8 +450,8 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev)
 					      "cpu", 1, NULL, 0, 0, NULL, 0,
 					      edac_dev_idx);
 	if (!edac_dev) {
-		devres_release_group(&pdev->dev, mv64x60_cpu_err_probe);
-		return -ENOMEM;
+		res = -ENOMEM;
+		goto release_group;
 	}
 
 	pdata = edac_dev->pvt_info;
@@ -561,8 +561,9 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev)
 err2:
 	edac_device_del_device(&pdev->dev);
 err:
-	devres_release_group(&pdev->dev, mv64x60_cpu_err_probe);
 	edac_device_free_ctl_info(edac_dev);
+release_group:
+	devres_release_group(&pdev->dev, mv64x60_cpu_err_probe);
 	return res;
 }
 
-- 
2.14.1