Skip to content

Commit

Permalink
pinctrl: sunplus: Add check for kmalloc
Browse files Browse the repository at this point in the history
[ Upstream commit a5961be ]

Fix Smatch static checker warning:
potential null dereference 'configs'. (kmalloc returns null)

Fixes: aa74c44 ("pinctrl: Add driver for Sunplus SP7021")
Signed-off-by: Wells Lu <wellslutw@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/1685277277-12209-1-git-send-email-wellslutw@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Wells Lu authored and gregkh committed Jul 19, 2023
1 parent bc796f6 commit 019d4fd
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions drivers/pinctrl/sunplus/sppctl.c
Expand Up @@ -838,11 +838,6 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
int i, size = 0;

list = of_get_property(np_config, "sunplus,pins", &size);

if (nmG <= 0)
nmG = 0;

parent = of_get_parent(np_config);
*num_maps = size / sizeof(*list);

/*
Expand Down Expand Up @@ -870,10 +865,14 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
}
}

if (nmG <= 0)
nmG = 0;

*map = kcalloc(*num_maps + nmG, sizeof(**map), GFP_KERNEL);
if (*map == NULL)
if (!(*map))
return -ENOMEM;

parent = of_get_parent(np_config);
for (i = 0; i < (*num_maps); i++) {
dt_pin = be32_to_cpu(list[i]);
pin_num = FIELD_GET(GENMASK(31, 24), dt_pin);
Expand All @@ -887,6 +886,8 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
(*map)[i].data.configs.num_configs = 1;
(*map)[i].data.configs.group_or_pin = pin_get_name(pctldev, pin_num);
configs = kmalloc(sizeof(*configs), GFP_KERNEL);
if (!configs)
goto sppctl_map_err;
*configs = FIELD_GET(GENMASK(7, 0), dt_pin);
(*map)[i].data.configs.configs = configs;

Expand All @@ -900,6 +901,8 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
(*map)[i].data.configs.num_configs = 1;
(*map)[i].data.configs.group_or_pin = pin_get_name(pctldev, pin_num);
configs = kmalloc(sizeof(*configs), GFP_KERNEL);
if (!configs)
goto sppctl_map_err;
*configs = SPPCTL_IOP_CONFIGS;
(*map)[i].data.configs.configs = configs;

Expand Down Expand Up @@ -969,6 +972,15 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
of_node_put(parent);
dev_dbg(pctldev->dev, "%d pins mapped\n", *num_maps);
return 0;

sppctl_map_err:
for (i = 0; i < (*num_maps); i++)
if (((*map)[i].type == PIN_MAP_TYPE_CONFIGS_PIN) &&
(*map)[i].data.configs.configs)
kfree((*map)[i].data.configs.configs);
kfree(*map);
of_node_put(parent);
return -ENOMEM;
}

static const struct pinctrl_ops sppctl_pctl_ops = {
Expand Down

0 comments on commit 019d4fd

Please sign in to comment.