TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: mfd-core: Protect against NULL call-back function pointer

Browse Source 
[ Upstream commit b195e101580db390f50b0d587b7f66f241d2bc88 ]

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:
Lee Jones
2019-10-21 10:16:34 +01:00
committed by Greg Kroah-Hartman
parent 6edb956e3c
commit 66bde9c7f0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mfd/mfd-core.c
View File

@@ -32,6 +32,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);
@@ -49,6 +54,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);