linux-kernel - [PATCH] regmap: fix NULL pointer dereference in __regmap

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

Message-Id: <1441041429-28749-1-git-send-email-sylvain.rochet@finsecur.com>
Date:	Mon, 31 Aug 2015 19:17:09 +0200
From:	Sylvain Rochet <sylvain.rochet@...secur.com>
To:	Mark Brown <broonie@...nel.org>,
	Markus Pargmann <mpa@...gutronix.de>,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
	Xiubo Li <lixiubo@...s.chinamobile.com>,
	Nicolas Boichat <drinkcat@...omium.org>,
	Pankaj Dubey <pankaj.dubey@...sung.com>,
	linux-kernel@...r.kernel.org,
	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Sylvain Rochet <sylvain.rochet@...secur.com>
Subject: [PATCH] regmap: fix NULL pointer dereference in __regmap_init if bus is NULL

This fix adds a check for bus pointer before using bus struct members.

Signed-off-by: Sylvain Rochet <sylvain.rochet@...secur.com>
---
 drivers/base/regmap/regmap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

It was introduced by https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=5e5a40ab02e497fd234a54c3fb6eb05286636e7a
but I failed to find the commit which is not the merge commit.

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 650d3b1..7797cfd 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -574,8 +574,10 @@ struct regmap *__regmap_init(struct device *dev,
 	map->use_single_read = config->use_single_rw || !bus || !bus->read;
 	map->use_single_write = config->use_single_rw || !bus || !bus->write;
 	map->can_multi_write = config->can_multi_write && bus && bus->write;
-	map->max_raw_read = bus->max_raw_read;
-	map->max_raw_write = bus->max_raw_write;
+	if (bus) {
+		map->max_raw_read = bus->max_raw_read;
+		map->max_raw_write = bus->max_raw_write;
+	}
 	map->dev = dev;
 	map->bus = bus;
 	map->bus_context = bus_context;
-- 
2.5.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/