Skip to content

Commit 74adad5

Browse files
joehattorigregkh
authored andcommitted
usb: chipidea: ci_hdrc_imx: decrement device's refcount in .remove() and in the error path of .probe()
Current implementation of ci_hdrc_imx_driver does not decrement the refcount of the device obtained in usbmisc_get_init_data(). Add a put_device() call in .remove() and in .probe() before returning an error. This bug was found by an experimental static analysis tool that I am developing. Cc: stable <[email protected]> Fixes: f40017e ("chipidea: usbmisc_imx: Add USB support for VF610 SoCs") Signed-off-by: Joe Hattori <[email protected]> Acked-by: Peter Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f47eba0 commit 74adad5

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

drivers/usb/chipidea/ci_hdrc_imx.c

+17-8
Original file line numberDiff line numberDiff line change
@@ -370,25 +370,29 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
370370
data->pinctrl = devm_pinctrl_get(dev);
371371
if (PTR_ERR(data->pinctrl) == -ENODEV)
372372
data->pinctrl = NULL;
373-
else if (IS_ERR(data->pinctrl))
374-
return dev_err_probe(dev, PTR_ERR(data->pinctrl),
373+
else if (IS_ERR(data->pinctrl)) {
374+
ret = dev_err_probe(dev, PTR_ERR(data->pinctrl),
375375
"pinctrl get failed\n");
376+
goto err_put;
377+
}
376378

377379
data->hsic_pad_regulator =
378380
devm_regulator_get_optional(dev, "hsic");
379381
if (PTR_ERR(data->hsic_pad_regulator) == -ENODEV) {
380382
/* no pad regulator is needed */
381383
data->hsic_pad_regulator = NULL;
382-
} else if (IS_ERR(data->hsic_pad_regulator))
383-
return dev_err_probe(dev, PTR_ERR(data->hsic_pad_regulator),
384+
} else if (IS_ERR(data->hsic_pad_regulator)) {
385+
ret = dev_err_probe(dev, PTR_ERR(data->hsic_pad_regulator),
384386
"Get HSIC pad regulator error\n");
387+
goto err_put;
388+
}
385389

386390
if (data->hsic_pad_regulator) {
387391
ret = regulator_enable(data->hsic_pad_regulator);
388392
if (ret) {
389393
dev_err(dev,
390394
"Failed to enable HSIC pad regulator\n");
391-
return ret;
395+
goto err_put;
392396
}
393397
}
394398
}
@@ -402,13 +406,14 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
402406
dev_err(dev,
403407
"pinctrl_hsic_idle lookup failed, err=%ld\n",
404408
PTR_ERR(pinctrl_hsic_idle));
405-
return PTR_ERR(pinctrl_hsic_idle);
409+
ret = PTR_ERR(pinctrl_hsic_idle);
410+
goto err_put;
406411
}
407412

408413
ret = pinctrl_select_state(data->pinctrl, pinctrl_hsic_idle);
409414
if (ret) {
410415
dev_err(dev, "hsic_idle select failed, err=%d\n", ret);
411-
return ret;
416+
goto err_put;
412417
}
413418

414419
data->pinctrl_hsic_active = pinctrl_lookup_state(data->pinctrl,
@@ -417,7 +422,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
417422
dev_err(dev,
418423
"pinctrl_hsic_active lookup failed, err=%ld\n",
419424
PTR_ERR(data->pinctrl_hsic_active));
420-
return PTR_ERR(data->pinctrl_hsic_active);
425+
ret = PTR_ERR(data->pinctrl_hsic_active);
426+
goto err_put;
421427
}
422428
}
423429

@@ -527,6 +533,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
527533
if (pdata.flags & CI_HDRC_PMQOS)
528534
cpu_latency_qos_remove_request(&data->pm_qos_req);
529535
data->ci_pdev = NULL;
536+
err_put:
537+
put_device(data->usbmisc_data->dev);
530538
return ret;
531539
}
532540

@@ -551,6 +559,7 @@ static void ci_hdrc_imx_remove(struct platform_device *pdev)
551559
if (data->hsic_pad_regulator)
552560
regulator_disable(data->hsic_pad_regulator);
553561
}
562+
put_device(data->usbmisc_data->dev);
554563
}
555564

556565
static void ci_hdrc_imx_shutdown(struct platform_device *pdev)

0 commit comments

Comments
 (0)