diff options
| author | Kiran Gunda <kgunda@codeaurora.org> | 2017-07-28 12:40:45 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 13:51:19 +0200 |
| commit | 000e1a43d3d2d4541f10be997c1609b69beb22d5 (patch) | |
| tree | 0dd078ffbf74c6349dce92c8375be3033a788c7d /drivers/spmi | |
| parent | e95d073c8ce397a8e77c36a208be978060bb214f (diff) | |
| download | linux-000e1a43d3d2d4541f10be997c1609b69beb22d5.tar.bz2 | |
spmi: pmic-arb: fix a possible null pointer dereference
If "core" memory resource is not specified, then the driver could
end up dereferencing a null pointer. Fix this issue.
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spmi')
| -rw-r--r-- | drivers/spmi/spmi-pmic-arb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 88fe42180f42..bc68e08ea14e 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -955,14 +955,14 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) pmic_arb->spmic = ctrl; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); - pmic_arb->core_size = resource_size(res); - core = devm_ioremap_resource(&ctrl->dev, res); if (IS_ERR(core)) { err = PTR_ERR(core); goto err_put_ctrl; } + pmic_arb->core_size = resource_size(res); + pmic_arb->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, sizeof(*pmic_arb->ppid_to_apid), GFP_KERNEL); |