Skip to contentSkip to conversation

media: imx7-mipi-csis: Add a check for devm_regulator_get

PATCH In review Chuhong Yuan 3 participants 6 messages Oct 15, 2019 – Oct 17, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 media: imx7-mipi-csis: Add a check for devm_regulator_get

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
2.20.1
#1 lore raw

Hi Chuhong,

Quoted 10 lines · Chuhong Yuan

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

Did you miss the check for -EPROBE_DEFER?

Regards,
Marco

Quoted 34 lines
 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
2.20.1
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#2 lore raw

Hi Marco,

Quoted 9 lines · Marco Felsch

Hi Chuhong,

Quoted 6 lines · Chuhong Yuan

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

Quoted 7 lines
Quoted 4 lines

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

Did you miss the check for -EPROBE_DEFER?

I think nothing special is really needed to do in case of EPROBE_DEFER, or am I missing something?
It just return to probe and probe returns also. I just talked about it because it was not cover in the original code.

---
Cheers,
Rui

Quoted 32 lines

Regards,
Marco

Quoted 28 lines
 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
Quoted 6 lines
Quoted 6 lines
drivers/staging/media/imx/imx7-mipi-csis.c +0 -1
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--

2.20.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

Hi Rui,

Quoted 16 lines · Rui Miguel Silva

Hi Marco,

Quoted 14 lines · Marco Felsch

Hi Chuhong,

Quoted 10 lines · Chuhong Yuan

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

Quoted 7 lines
Quoted 2 lines

Did you miss the check for -EPROBE_DEFER?

I think nothing special is really needed to do in case of EPROBE_DEFER, or am I missing something?
It just return to probe and probe returns also. I just talked about it because it was not cover in the original code.

Yes, your are right... I shouldn't comment on anything I read with one eye. Sorry.

Regards,
Marco

Quoted 44 lines

---
Cheers,
Rui

Quoted 38 lines

Regards,
Marco

Quoted 34 lines
 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -2
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--

2.20.1

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#4 lore raw

Hi Marco,

Quoted 22 lines · Marco Felsch

Hi Rui,

Quoted 19 lines · Rui Miguel Silva

Hi Marco,

Quoted 16 lines · Marco Felsch

Hi Chuhong,

Quoted 10 lines · Chuhong Yuan

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

Did you miss the check for -EPROBE_DEFER?

Quoted 8 lines
Quoted 4 lines

I think nothing special is really needed to do in case of EPROBE_DEFER, or am I missing something?
It just return to probe and probe returns also. I just talked about it because it was not cover in the original code.

Yes, your are right... I shouldn't comment on anything I read with one eye. Sorry.

ehehe, no problem and thanks for your inputs.

---
Cheers,
Rui

Quoted 48 lines

Regards,
Marco

Quoted 44 lines

---
Cheers,
Rui

Quoted 38 lines

Regards,
Marco

Quoted 34 lines
 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -2
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--

2.20.1

Reviewed-by on v2 1/1
#5 lore raw
In reply to Chuhong Yuan

Hi Chuhong,
many thanks for the patch.

Quoted 7 lines · Chuhong Yuan

devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.

---
Cheers,
Rui

Quoted 32 lines

---
Changes in v2:
- Add a check in mipi_csis_probe for the modified mipi_csis_phy_init.

 drivers/staging/media/imx/imx7-mipi-csis.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
index 73d8354e618c..e8a6acaa969e 100644
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)
 static int mipi_csis_phy_init(struct csi_state *state)
 {
 	state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+	if (IS_ERR(state->mipi_phy_regulator))
+		return PTR_ERR(state->mipi_phy_regulator);
 
 	return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
 				     1000000);
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	mipi_csis_phy_init(state);
+	ret = mipi_csis_phy_init(state);
+	if (ret < 0)
+		return ret;
+
 	mipi_csis_phy_reset(state);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);