From: YueHaibing <yuehaibing@huawei.com>
To: <jeyu@kernel.org>, <gregkh@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>, <paulmck@linux.ibm.com>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH v2] kernel/module: Fix mem leak in module_add_modinfo_attrs
Date: Thu, 30 May 2019 21:43:04 +0800 [thread overview]
Message-ID: <20190530134304.4976-1-yuehaibing@huawei.com> (raw)
In-Reply-To: <20190515161212.28040-1-yuehaibing@huawei.com>
In module_add_modinfo_attrs if sysfs_create_file
fails, we forget to free allocated modinfo_attrs
and roll back the sysfs files.
Fixes: 03e88ae1b13d ("[PATCH] fix module sysfs files reference counting")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: free from '--i' instead of 'i--'
---
kernel/module.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/kernel/module.c b/kernel/module.c
index 6e6712b..78e21a7 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1723,15 +1723,29 @@ static int module_add_modinfo_attrs(struct module *mod)
return -ENOMEM;
temp_attr = mod->modinfo_attrs;
- for (i = 0; (attr = modinfo_attrs[i]) && !error; i++) {
+ for (i = 0; (attr = modinfo_attrs[i]); i++) {
if (!attr->test || attr->test(mod)) {
memcpy(temp_attr, attr, sizeof(*temp_attr));
sysfs_attr_init(&temp_attr->attr);
error = sysfs_create_file(&mod->mkobj.kobj,
&temp_attr->attr);
+ if (error)
+ goto error_out;
++temp_attr;
}
}
+
+ return 0;
+
+error_out:
+ for (; (attr = &mod->modinfo_attrs[i]) && i >= 0; --i) {
+ if (!attr->attr.name)
+ break;
+ sysfs_remove_file(&mod->mkobj.kobj, &attr->attr);
+ if (attr->free)
+ attr->free(mod);
+ }
+ kfree(mod->modinfo_attrs);
return error;
}
--
2.7.4
next prev parent reply other threads:[~2019-05-30 13:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 16:12 [PATCH] kernel/module: Fix mem leak in module_add_modinfo_attrs YueHaibing
2019-05-30 9:24 ` Yuehaibing
2019-05-30 11:45 ` Jessica Yu
2019-05-30 13:32 ` Yuehaibing
2019-05-30 13:43 ` YueHaibing [this message]
2019-06-03 10:47 ` [PATCH v2] " Jessica Yu
2019-06-03 12:41 ` Yuehaibing
2019-06-03 12:11 ` Miroslav Benes
2019-06-03 14:45 ` Yuehaibing
2019-06-03 14:45 ` [PATCH v3] " YueHaibing
2019-06-04 10:46 ` Miroslav Benes
2019-06-04 13:54 ` Yuehaibing
2019-06-04 14:15 ` Miroslav Benes
2019-06-07 14:02 ` Jessica Yu
2019-06-11 13:33 ` Jessica Yu
2019-06-11 14:30 ` Yuehaibing
2019-06-11 15:38 ` Greg KH
2019-06-11 15:00 ` [PATCH v4] " YueHaibing
2019-06-12 11:12 ` Miroslav Benes
2019-06-14 7:54 ` Jessica Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190530134304.4976-1-yuehaibing@huawei.com \
--to=yuehaibing@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).