From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Chengguang Xu <cgxu519@gmx.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.4 06/11] fs/exofs: fix potential memory leak in mount option parsing
Date: Tue, 13 Nov 2018 00:52:37 -0500 [thread overview]
Message-ID: <20181113055242.79261-6-sashal@kernel.org> (raw)
In-Reply-To: <20181113055242.79261-1-sashal@kernel.org>
From: Chengguang Xu <cgxu519@gmx.com>
[ Upstream commit 515f1867addaba49c1c6ac73abfaffbc192c1db4 ]
There are some cases can cause memory leak when parsing
option 'osdname'.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/exofs/super.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index b795c567b5e1..360ba74e04e6 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -100,6 +100,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts)
token = match_token(p, tokens, args);
switch (token) {
case Opt_name:
+ kfree(opts->dev_name);
opts->dev_name = match_strdup(&args[0]);
if (unlikely(!opts->dev_name)) {
EXOFS_ERR("Error allocating dev_name");
@@ -868,8 +869,10 @@ static struct dentry *exofs_mount(struct file_system_type *type,
int ret;
ret = parse_options(data, &opts);
- if (ret)
+ if (ret) {
+ kfree(opts.dev_name);
return ERR_PTR(ret);
+ }
if (!opts.dev_name)
opts.dev_name = dev_name;
--
2.17.1
next prev parent reply other threads:[~2018-11-13 5:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 5:52 [PATCH AUTOSEL 4.4 01/11] bfs: add sanity check at bfs_fill_super() Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 02/11] reiserfs: propagate errors from fill_with_dentries() properly Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 03/11] hfs: prevent btree data loss on root split Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 04/11] hfsplus: " Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 05/11] um: Give start_idle_thread() a return code Sasha Levin
2018-11-13 5:52 ` Sasha Levin [this message]
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 07/11] clk: samsung: exynos5420: Enable PERIS clocks for suspend Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 08/11] platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 09/11] arm64: percpu: Initialize ret in the default case Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 10/11] mm/vmstat.c: assert that vmstat_text is in sync with stat_items_size Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.4 11/11] mm: don't warn about large allocations for slab Sasha Levin
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=20181113055242.79261-6-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=cgxu519@gmx.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).