[PATCH] mmc: core: Check regulator pointer

From	Maxime Ripard <maxime.ripard@free-electrons.com>
Newsgroups	linux.kernel
Subject	[PATCH] mmc: core: Check regulator pointer
Date	2016-10-18 10:50 +0200
Message-ID	<styfT-7GN-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

mmc_regulator_get_supply might silently fail if the regulators are not
found, which is the right thing to do since both these regulators are
optional.

However, the drivers then have no way to know whether or not they should
proceed and call mmc_regulator_set_ocr. And since this function doesn't
check for the validity of the regulator pointer, it leads to a null pointer
dereference. Add such a check to make sure everything works fine.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/mmc/core/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 2553d903a82b..1d3ea5e1aa37 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1474,6 +1474,12 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
 	int			result = 0;
 	int			min_uV, max_uV;
 
+	if (!supply)
+		return -EINVAL;
+
+	if (IS_ERR(supply))
+		return PTR_ERR(supply);
+
 	if (vdd_bit) {
 		mmc_ocrbitnum_to_vdd(vdd_bit, &min_uV, &max_uV);
 
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mmc: core: Check regulator pointer Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-18 10:50 +0200
  Re: [PATCH] mmc: core: Check regulator pointer Baolin Wang <baolin.wang@linaro.org> - 2016-10-18 11:00 +0200
  Re: [PATCH] mmc: core: Check regulator pointer Ulf Hansson <ulf.hansson@linaro.org> - 2016-10-18 11:10 +0200
    Re: [PATCH] mmc: core: Check regulator pointer Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-18 11:50 +0200
      Re: [PATCH] mmc: core: Check regulator pointer Ulf Hansson <ulf.hansson@linaro.org> - 2016-10-18 12:30 +0200
      Re: [PATCH] mmc: core: Check regulator pointer Shawn Lin <shawn.lin@rock-chips.com> - 2016-10-18 14:30 +0200

csiph-web