mfd: mfd-core: Protect against NULL call-back function pointer
[ Upstream commit b195e10158
]
If a child device calls mfd_cell_{en,dis}able() without an appropriate
call-back being set, we are likely to encounter a panic. Avoid this
by adding suitable checking.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
deb34c91eb
commit
022a2a0728
|
@ -28,6 +28,11 @@ int mfd_cell_enable(struct platform_device *pdev)
|
||||||
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
if (!cell->enable) {
|
||||||
|
dev_dbg(&pdev->dev, "No .enable() call-back registered\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* only call enable hook if the cell wasn't previously enabled */
|
/* only call enable hook if the cell wasn't previously enabled */
|
||||||
if (atomic_inc_return(cell->usage_count) == 1)
|
if (atomic_inc_return(cell->usage_count) == 1)
|
||||||
err = cell->enable(pdev);
|
err = cell->enable(pdev);
|
||||||
|
@ -45,6 +50,11 @@ int mfd_cell_disable(struct platform_device *pdev)
|
||||||
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
if (!cell->disable) {
|
||||||
|
dev_dbg(&pdev->dev, "No .disable() call-back registered\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* only disable if no other clients are using it */
|
/* only disable if no other clients are using it */
|
||||||
if (atomic_dec_return(cell->usage_count) == 0)
|
if (atomic_dec_return(cell->usage_count) == 0)
|
||||||
err = cell->disable(pdev);
|
err = cell->disable(pdev);
|
||||||
|
|
Loading…
Reference in New Issue