diff options
author | Kiran Gunda <kgunda@codeaurora.org> | 2017-07-28 03:10:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 07:51:19 -0400 |
commit | 000e1a43d3d2d4541f10be997c1609b69beb22d5 (patch) | |
tree | 0dd078ffbf74c6349dce92c8375be3033a788c7d /drivers/spmi | |
parent | e95d073c8ce397a8e77c36a208be978060bb214f (diff) |
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) | |||
955 | pmic_arb->spmic = ctrl; | 955 | pmic_arb->spmic = ctrl; |
956 | 956 | ||
957 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); | 957 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); |
958 | pmic_arb->core_size = resource_size(res); | ||
959 | |||
960 | core = devm_ioremap_resource(&ctrl->dev, res); | 958 | core = devm_ioremap_resource(&ctrl->dev, res); |
961 | if (IS_ERR(core)) { | 959 | if (IS_ERR(core)) { |
962 | err = PTR_ERR(core); | 960 | err = PTR_ERR(core); |
963 | goto err_put_ctrl; | 961 | goto err_put_ctrl; |
964 | } | 962 | } |
965 | 963 | ||
964 | pmic_arb->core_size = resource_size(res); | ||
965 | |||
966 | pmic_arb->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, | 966 | pmic_arb->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, |
967 | sizeof(*pmic_arb->ppid_to_apid), | 967 | sizeof(*pmic_arb->ppid_to_apid), |
968 | GFP_KERNEL); | 968 | GFP_KERNEL); |