[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1422418236-12852-62-git-send-email-lizf@kernel.org>
Date: Wed, 28 Jan 2015 12:07:09 +0800
From: lizf@...nel.org
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Xiubo Li <Li.Xiubo@...escale.com>,
Mark Brown <broonie@...nel.org>, Zefan Li <lizefan@...wei.com>
Subject: [PATCH 3.4 031/177] regmap: debugfs: fix possbile NULL pointer dereference
From: Xiubo Li <Li.Xiubo@...escale.com>
3.4.106-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 2c98e0c1cc6b8e86f1978286c3d4e0769ee9d733 upstream.
If 'map->dev' is NULL and there will lead dev_name() to be NULL pointer
dereference. So before dev_name(), we need to have check of the map->dev
pionter.
We also should make sure that the 'name' pointer shouldn't be NULL for
debugfs_create_dir(). So here using one default "dummy" debugfs name when
the 'name' pointer and 'map->dev' are both NULL.
Signed-off-by: Xiubo Li <Li.Xiubo@...escale.com>
Signed-off-by: Mark Brown <broonie@...nel.org>
[lizf: Backported to 3.4: dev_name() is passed to debugfs_create_dir() in 3.4]
Signed-off-by: Zefan Li <lizefan@...wei.com>
---
drivers/base/regmap/regmap-debugfs.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 8ab1eab..1db1289 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -244,7 +244,12 @@ static const struct file_operations regmap_access_fops = {
void regmap_debugfs_init(struct regmap *map)
{
- map->debugfs = debugfs_create_dir(dev_name(map->dev),
+ const char *devname = "dummy";
+
+ if (map->dev)
+ devname = dev_name(map->dev);
+
+ map->debugfs = debugfs_create_dir(devname,
regmap_debugfs_root);
if (!map->debugfs) {
dev_warn(map->dev, "Failed to create debugfs directory\n");
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists