evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pinctrl: samsung: don't truncate the last char

Browse source 
We were allocating enough space because sizeof("-grp") and
sizeof("-mux") are both equal to 5 but in the snprintf() we only allowed
for 4 characters so the last 'p' and 'x' characters were truncated.

The allocate and sprintf can be done in one step with the kasprintf().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Dan Carpenter 2015-06-22 18:12:24 +03:00 • committed by Linus Walleij
parent 95b612cc6c
commit 8749f8ed5c
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/pinctrl/samsung/pinctrl-exynos5440.c
View file

@ -44,9 +44,7 @@
#define PIN_NAME_LENGTH 10 #define PIN_NAME_LENGTH 10
#define GROUP_SUFFIX "-grp" #define GROUP_SUFFIX "-grp"
#define GSUFFIX_LEN sizeof(GROUP_SUFFIX)
#define FUNCTION_SUFFIX "-mux" #define FUNCTION_SUFFIX "-mux"
#define FSUFFIX_LEN sizeof(FUNCTION_SUFFIX)
/* /*
* pin configuration type and its value are packed together into a 16-bits. * pin configuration type and its value are packed together into a 16-bits.
@ -215,12 +213,11 @@ static int exynos5440_dt_node_to_map(struct pinctrl_dev *pctldev,
* Allocate memory for pin group name. The pin group name is derived * Allocate memory for pin group name. The pin group name is derived
* from the node name from which these map entries are be created. * from the node name from which these map entries are be created.
*/ */
gname = kzalloc(strlen(np->name) + GSUFFIX_LEN, GFP_KERNEL); gname = kasprintf(GFP_KERNEL, "%s%s", np->name, GROUP_SUFFIX);
if (!gname) { if (!gname) {
dev_err(dev, "failed to alloc memory for group name\n"); dev_err(dev, "failed to alloc memory for group name\n");
goto free_map; goto free_map;
} }
snprintf(gname, strlen(np->name) + 4, "%s%s", np->name, GROUP_SUFFIX);
/* /*
* don't have config options? then skip over to creating function * don't have config options? then skip over to creating function
@ -254,13 +251,12 @@ static int exynos5440_dt_node_to_map(struct pinctrl_dev *pctldev,
skip_cfgs: skip_cfgs:
/* create the function map entry */ /* create the function map entry */
if (of_find_property(np, "samsung,exynos5440-pin-function", NULL)) { if (of_find_property(np, "samsung,exynos5440-pin-function", NULL)) {
fname = kzalloc(strlen(np->name) + FSUFFIX_LEN, GFP_KERNEL); fname = kasprintf(GFP_KERNEL,
"%s%s", np->name, FUNCTION_SUFFIX);
if (!fname) { if (!fname) {
dev_err(dev, "failed to alloc memory for func name\n"); dev_err(dev, "failed to alloc memory for func name\n");
goto free_cfg; goto free_cfg;
} }
snprintf(fname, strlen(np->name) + 4, "%s%s", np->name,
FUNCTION_SUFFIX);
map[*nmaps].data.mux.group = gname; map[*nmaps].data.mux.group = gname;
map[*nmaps].data.mux.function = fname; map[*nmaps].data.mux.function = fname;
@ -710,14 +706,12 @@ static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev,
} }
/* derive pin group name from the node name */ /* derive pin group name from the node name */
gname = devm_kzalloc(dev, strlen(cfg_np->name) + GSUFFIX_LEN, gname = devm_kasprintf(dev, GFP_KERNEL,
GFP_KERNEL); "%s%s", cfg_np->name, GROUP_SUFFIX);
if (!gname) { if (!gname) {
dev_err(dev, "failed to alloc memory for group name\n"); dev_err(dev, "failed to alloc memory for group name\n");
return -ENOMEM; return -ENOMEM;
} }
snprintf(gname, strlen(cfg_np->name) + 4, "%s%s", cfg_np->name,
GROUP_SUFFIX);
grp->name = gname; grp->name = gname;
grp->pins = pin_list; grp->pins = pin_list;
@ -731,14 +725,12 @@ skip_to_pin_function:
continue; continue;
/* derive function name from the node name */ /* derive function name from the node name */
fname = devm_kzalloc(dev, strlen(cfg_np->name) + FSUFFIX_LEN, fname = devm_kasprintf(dev, GFP_KERNEL,
GFP_KERNEL); "%s%s", cfg_np->name, FUNCTION_SUFFIX);
if (!fname) { if (!fname) {
dev_err(dev, "failed to alloc memory for func name\n"); dev_err(dev, "failed to alloc memory for func name\n");
return -ENOMEM; return -ENOMEM;
} }
snprintf(fname, strlen(cfg_np->name) + 4, "%s%s", cfg_np->name,
FUNCTION_SUFFIX);
func->name = fname; func->name = fname;
func->groups = devm_kzalloc(dev, sizeof(char *), GFP_KERNEL); func->groups = devm_kzalloc(dev, sizeof(char *), GFP_KERNEL);