linux-kernel - [PATCH V1] acpi : nfit : core :- No need of devm functions

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>] [day] [month] [year] [list]

Date:   Wed,  7 Dec 2016 21:12:36 +0530
From:   Arvind Yadav <arvind.yadav.cs@...il.com>
To:     rjw@...ysocki.net, lenb@...nel.org
Cc:     dan.j.williams@...el.com, vishal.l.verma@...el.com,
        joeyli.kernel@...il.com, toshi.kani@....com,
        linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH V1] acpi : nfit : core :- No need of devm functions

In function acpi_nfit_init_interleave_set, the memory allocated
for 'info' is live within the function only. After the allocation
it is immediately freed with devm_kfree. There is no need to
allocate memory for 'info' with devm function so replace
devm_kzalloc with kzalloc and devm_kfree with kfree.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@...il.com>
---
 drivers/acpi/nfit/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 71a7d07..bd7e4e7 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1631,7 +1631,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
 	if (!nd_set)
 		return -ENOMEM;
 
-	info = devm_kzalloc(dev, sizeof_nfit_set_info(nr), GFP_KERNEL);
+	info = kzalloc(sizeof_nfit_set_info(nr), GFP_KERNEL);
 	if (!info)
 		return -ENOMEM;
 	for (i = 0; i < nr; i++) {
@@ -1644,6 +1644,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
 
 		if (!memdev || !nfit_mem->dcr) {
 			dev_err(dev, "%s: failed to find DCR\n", __func__);
+			kfree(info);
 			return -ENODEV;
 		}
 
@@ -1655,7 +1656,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
 			cmp_map, NULL);
 	nd_set->cookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0);
 	ndr_desc->nd_set = nd_set;
-	devm_kfree(dev, info);
+	kfree(info);
 
 	return 0;
 }
-- 
2.7.4