From: Mark Brown <broonie@kernel.org>
To: Jeffy Chen <jeffy.chen@rock-chips.com>
Cc: Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Applied "regmap: debugfs: Free map->debugfs_name when debugfs_create_dir() failed" to the regmap tree
Date: Wed, 07 Mar 2018 14:15:13 +0000 [thread overview]
Message-ID: <E1etZqb-0001Z6-4n@debutante> (raw)
In-Reply-To: <20180306110403.14438-3-jeffy.chen@rock-chips.com>
The patch
regmap: debugfs: Free map->debugfs_name when debugfs_create_dir() failed
has been applied to the regmap tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 17cf46cfe975f1dd04db6bd38398923846512d49 Mon Sep 17 00:00:00 2001
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Date: Tue, 6 Mar 2018 19:04:03 +0800
Subject: [PATCH] regmap: debugfs: Free map->debugfs_name when
debugfs_create_dir() failed
Free map->debugfs_name when debugfs_create_dir() failed to avoid memory
leak.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/base/regmap/regmap-debugfs.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index dd3a16894e3c..c84f5ceb015a 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -584,6 +584,9 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);
if (!map->debugfs) {
dev_warn(map->dev, "Failed to create debugfs directory\n");
+
+ kfree(map->debugfs_name);
+ map->debugfs_name = NULL;
return;
}
--
2.16.2
next prev parent reply other threads:[~2018-03-07 14:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 11:04 [PATCH v2 1/3] mfd: syscon: Set name of regmap_config Jeffy Chen
2018-03-06 11:04 ` [PATCH v2 2/3] regmap: debugfs: Fix kmemleak in regmap_debugfs_init Jeffy Chen
2018-03-06 12:59 ` Mark Brown
2018-03-07 10:56 ` JeffyChen
2018-03-06 11:04 ` [PATCH v2 3/3] regmap: debugfs: Free map->debugfs_name when debugfs_create_dir() failed Jeffy Chen
2018-03-07 14:15 ` Mark Brown [this message]
2018-03-06 14:58 ` [PATCH v2 1/3] mfd: syscon: Set name of regmap_config JeffyChen
2018-03-07 10:20 ` Mark Brown
2018-03-07 10:50 ` JeffyChen
2018-03-07 10:57 ` Mark Brown
2018-03-07 16:54 ` Lee Jones
2018-03-07 16:57 ` Mark Brown
2018-03-12 14:07 ` Lee Jones
2018-03-12 16:11 ` Mark Brown
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=E1etZqb-0001Z6-4n@debutante \
--to=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jeffy.chen@rock-chips.com \
--cc=linux-kernel@vger.kernel.org \
/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).