]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk/ti/adpll: allocate room for terminating null
authorStephen Kitt <steve@sk2.org>
Sat, 19 Oct 2019 14:06:34 +0000 (16:06 +0200)
committerStephen Boyd <sboyd@kernel.org>
Fri, 8 Nov 2019 17:00:37 +0000 (09:00 -0800)
The buffer allocated in ti_adpll_clk_get_name doesn't account for the
terminating null. This patch switches to devm_kasprintf to avoid
overflowing.

Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lkml.kernel.org/r/20191019140634.15596-1-steve@sk2.org
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/ti/adpll.c

index fdfb90058504cac09c8acab4b827eee852d5fe3b..bb2f2836dab22cf82b1c067d2f0951900756574a 100644 (file)
@@ -194,15 +194,8 @@ static const char *ti_adpll_clk_get_name(struct ti_adpll_data *d,
                if (err)
                        return NULL;
        } else {
-               const char *base_name = "adpll";
-               char *buf;
-
-               buf = devm_kzalloc(d->dev, 8 + 1 + strlen(base_name) + 1 +
-                                   strlen(postfix), GFP_KERNEL);
-               if (!buf)
-                       return NULL;
-               sprintf(buf, "%08lx.%s.%s", d->pa, base_name, postfix);
-               name = buf;
+               name = devm_kasprintf(d->dev, GFP_KERNEL, "%08lx.adpll.%s",
+                                     d->pa, postfix);
        }
 
        return name;