| Message ID | 1390613561-28636-1-git-send-email-emilio@elopez.com.ar (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Emilio López (2014-01-24 17:32:41) > Currently, we are allocating space for two pointers, when we actually > may need to store three of them (two divisors plus the original clock). > Fix this, and change sizeof(type) to sizeof(*var) to keep checkpatch.pl > happy. > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Emilio López <emilio@elopez.com.ar> > --- > > Hi Mike, > > Is there any chance you can include this oneliner on your second part of > the pull request to Linus? Done. Regards, Mike > > Cheers, > > Emilio > > drivers/clk/sunxi/clk-sunxi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c > index 659e4ea..abb6c5a 100644 > --- a/drivers/clk/sunxi/clk-sunxi.c > +++ b/drivers/clk/sunxi/clk-sunxi.c > @@ -875,7 +875,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, > if (!clk_data) > return; > > - clks = kzalloc(SUNXI_DIVS_MAX_QTY * sizeof(struct clk *), GFP_KERNEL); > + clks = kzalloc((SUNXI_DIVS_MAX_QTY+1) * sizeof(*clks), GFP_KERNEL); > if (!clks) > goto free_clkdata; > > -- > 1.8.5.3 >
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 659e4ea..abb6c5a 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -875,7 +875,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, if (!clk_data) return; - clks = kzalloc(SUNXI_DIVS_MAX_QTY * sizeof(struct clk *), GFP_KERNEL); + clks = kzalloc((SUNXI_DIVS_MAX_QTY+1) * sizeof(*clks), GFP_KERNEL); if (!clks) goto free_clkdata;
Currently, we are allocating space for two pointers, when we actually may need to store three of them (two divisors plus the original clock). Fix this, and change sizeof(type) to sizeof(*var) to keep checkpatch.pl happy. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Emilio López <emilio@elopez.com.ar> --- Hi Mike, Is there any chance you can include this oneliner on your second part of the pull request to Linus? Cheers, Emilio drivers/clk/sunxi/clk-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)