Skip to contentSkip to conversation

regulator: axp20x: check rdev is null before dereferencing it

PATCH In review Colin King 4 participants 6 messages Dec 22, 2018 – Feb 15, 2019

Subsystems (3)
lore
Share & tools
lore

Colin King

author
#0 lore raw

PATCH v2 1/1 regulator: axp20x: check rdev is null before dereferencing it

From: Colin Ian King <[email protected]>

Currently rdev is dereferenced when assigning desc before rdev is null checked, hence there is a potential null pointer dereference on rdev. Fix this by null checking rdev first.

Detected by CoverityScan, CID#1476031 ("Dereference before null check")

Fixes 77e3e3b165db ("regulator: axp20x: add software based soft_start for AXP209 LDO3")

---

V2: Fix 2nd occurrance of this thinko

---
 drivers/regulator/axp20x-regulator.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +6 -2
index 48af859fd053..0dfa4ea6bbdf 100644
@@ -367,7 +367,7 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
 static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;
 	u8 reg, mask, enable, cfg = 0xff;
 	const int *slew_rates;
 	int rate_count = 0;
@@ -375,6 +375,8 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;
+
 	switch (axp20x->variant) {
 	case AXP209_ID:
 		if (desc->id = AXP20X_DCDC2) {
@@ -436,11 +438,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;
 
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;
+
 	switch (axp20x->variant) {
 	case AXP209_ID:
 		if ((desc->id = AXP20X_LDO3) &&
Signature · 1 line
2.19.1
#1 lore raw

ping?

Quoted 56 lines · Colin King

From: Colin Ian King <[email protected]>

Currently rdev is dereferenced when assigning desc before rdev is null checked, hence there is a potential null pointer dereference on rdev. Fix this by null checking rdev first.

Detected by CoverityScan, CID#1476031 ("Dereference before null check")

Fixes 77e3e3b165db ("regulator: axp20x: add software based soft_start for AXP209 LDO3")

---

V2: Fix 2nd occurrance of this thinko

---
 drivers/regulator/axp20x-regulator.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +6 -2
index 48af859fd053..0dfa4ea6bbdf 100644
@@ -367,7 +367,7 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
 static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;
 	u8 reg, mask, enable, cfg = 0xff;
 	const int *slew_rates;
 	int rate_count = 0;
@@ -375,6 +375,8 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;
+
 	switch (axp20x->variant) {
 	case AXP209_ID:
 		if (desc->id = AXP20X_DCDC2) {
@@ -436,11 +438,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;
 
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;
+
 	switch (axp20x->variant) {
 	case AXP209_ID:
 		if ((desc->id = AXP20X_LDO3) &&
maintainer
#2 lore raw
Quoted 1 line · Colin Ian King

ping?

Please don't send content free pings and please allow a reasonable time for review. People get busy, go on holiday, attend conferences and so on so unless there is some reason for urgency (like critical bug fixes) please allow at least a couple of weeks for review. If there have been review comments then people may be waiting for those to be addressed.

Sending content free pings adds to the mail volume (if they are seen at all) which is often the problem and since they can't be reviewed directly if something has gone wrong you'll have to resend the patches anyway, so sending again is generally a better approach though there are some other maintainers who like them - if in doubt look at how patches for the subsystem are normally handled.

#3 lore raw
In reply to Colin Ian King
Quoted 13 lines · Colin Ian King

drivers/regulator/axp20x-regulator.c static const int axp209_dcdc2_ldo3_slew_rates[] = { · line 370

Quoted 13 lines
 drivers/regulator/axp20x-regulator.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +1 -1
index 48af859fd053..0dfa4ea6bbdf 100644
@@ -367,7 +367,7 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
 static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;

This is only called from set_machine_constraints() so "rdev" can't be NULL. (On my allmodonconfig build).

Quoted 19 lines
Quoted 19 lines
drivers/regulator/axp20x-regulator.c +3 -1
 	u8 reg, mask, enable, cfg = 0xff;
 	const int *slew_rates;
 	int rate_count = 0;
@@ -375,6 +375,8 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;
+
 	switch (axp20x->variant) {
 	case AXP209_ID:
 		if (desc->id = AXP20X_DCDC2) {
@@ -436,11 +438,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
 {
 	struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-	const struct regulator_desc *desc = rdev->desc;
+	const struct regulator_desc *desc;
 
Quoted 4 lines

drivers/regulator/axp20x-regulator.c static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp) · line 378

Quoted 4 lines
drivers/regulator/axp20x-regulator.c +1 -0
 	if (!rdev)
 		return -EINVAL;
 
+	desc = rdev->desc;

Called from _regulator_do_enable() and rdev can't be NULL:

	ret = rdev->desc->ops->enable(rdev);

regards,
dan carpenter

#4 lore raw
In reply to Colin King
Quoted 11 lines · Colin King

From: Colin Ian King <[email protected]>

Currently rdev is dereferenced when assigning desc before rdev is null checked, hence there is a potential null pointer dereference on rdev. Fix this by null checking rdev first.

Detected by CoverityScan, CID#1476031 ("Dereference before null check")

Fixes 77e3e3b165db ("regulator: axp20x: add software based soft_start for AXP209 LDO3")

This patch somehow fell through the cracks. Sorry about that.

Both are really false positives. Both functions are callbacks for the regulator core to use. If you look through the core code, rdev->desc->ops is used to check for these callbacks before they are called. rdev is always passed in, and rdev->desc is always valid after regulator_register.

ChenYu

Quoted 48 lines

---

V2: Fix 2nd occurrance of this thinko

---
 drivers/regulator/axp20x-regulator.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +6 -3
index 48af859fd053..0dfa4ea6bbdf 100644
@@ -367,7 +367,7 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
 static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 {
        struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-       const struct regulator_desc *desc = rdev->desc;
+       const struct regulator_desc *desc;
        u8 reg, mask, enable, cfg = 0xff;
        const int *slew_rates;
        int rate_count = 0;
@@ -375,6 +375,8 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
        if (!rdev)
                return -EINVAL;
 
+       desc = rdev->desc;
+
        switch (axp20x->variant) {
        case AXP209_ID:
                if (desc->id = AXP20X_DCDC2) {
@@ -436,11 +438,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
 static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
 {
        struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
-       const struct regulator_desc *desc = rdev->desc;
+       const struct regulator_desc *desc;
 
        if (!rdev)
                return -EINVAL;
 
+       desc = rdev->desc;
+
        switch (axp20x->variant) {
        case AXP209_ID:
                if ((desc->id = AXP20X_LDO3) &&
--

2.19.1

#5 lore raw
Quoted 8 lines · Chen-Yu Tsai
Quoted 7 lines · Colin King

From: Colin Ian King <[email protected]>

Currently rdev is dereferenced when assigning desc before rdev is null checked, hence there is a potential null pointer dereference on rdev. Fix this by null checking rdev first.

Quoted 8 lines
Quoted 4 lines

Detected by CoverityScan, CID#1476031 ("Dereference before null check")

Fixes 77e3e3b165db ("regulator: axp20x: add software based soft_start for AXP209 LDO3")

This patch somehow fell through the cracks. Sorry about that.

Both are really false positives.

I don't like when people use the word "false positive" like this. The code doesn't checks for NULL after a dereference so that's a nonsense to do. The correct thing is to remove the NULL check.

regards,
dan carpenter