Messages in this thread Patch in this message |  | | From | Emil Goode <> | | Subject | [PATCH v2] mfd: fix unintentional NULL check in menelaus_set_voltage() | | Date | Wed, 28 May 2014 18:43:51 +0200 |
| |
The struct menelaus_vtg pointer vtg cannot be NULL here so the condition is never true and if it ever was true it would lead to a NULL pointer dereference when we goto label set_voltage.
Before the below patch was applied the code was:
if (vtg == 0)
The intention was to check if vtg_val is 0.
commit 59a9f7a32adf6537b4e4db8ca204eeb77d7a634e ("mfd: menelaus: Use NULL instead of 0")
Signed-off-by: Emil Goode <emilgoode@gmail.com> --- v2: Changed (vtg_val == 0) to (!vtg_val)
drivers/mfd/menelaus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index ad25bfa..40df76a 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -466,7 +466,7 @@ static int menelaus_set_voltage(const struct menelaus_vtg *vtg, int mV, struct i2c_client *c = the_menelaus->client; mutex_lock(&the_menelaus->lock); - if (!vtg) + if (!vtg_val) goto set_voltage; ret = menelaus_read_reg(vtg->vtg_reg); -- 1.7.10.4
|  |