Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1436224 > unrolled thread

[patch] drm/tegra: sor: Double free on error

Back to article view | Back to linux.kernel

Contents

  [patch] drm/tegra: sor: Double free on error Dan Carpenter <dan.carpenter@oracle.com> - 2016-07-04 09:50 +0200
    Re: [patch] drm/tegra: sor: Double free on error Alexandre Courbot <gnurou@gmail.com> - 2016-07-06 16:20 +0200

#1436224 — [patch] drm/tegra: sor: Double free on error

"brick" is allocated with devm_kzalloc() so freeing it with kfree()
leads to a double free.  We can just delete it.

Fixes: a7ba8310c7f5 ('drm/tegra: sor: Implement sor1_brick clock')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 8425eda..e750ced 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -345,7 +345,6 @@ static struct clk *tegra_clk_sor_brick_register(struct tegra_sor *sor,
 {
 	struct tegra_clk_sor_brick *brick;
 	struct clk_init_data init;
-	struct clk *clk;
 
 	brick = devm_kzalloc(sor->dev, sizeof(*brick), GFP_KERNEL);
 	if (!brick)
@@ -361,11 +360,7 @@ static struct clk *tegra_clk_sor_brick_register(struct tegra_sor *sor,
 
 	brick->hw.init = &init;
 
-	clk = devm_clk_register(sor->dev, &brick->hw);
-	if (IS_ERR(clk))
-		kfree(brick);
-
-	return clk;
+	return devm_clk_register(sor->dev, &brick->hw);
 }
 
 static int tegra_sor_dp_train_fast(struct tegra_sor *sor,

[toc] | [next] | [standalone]

#1437754

On Mon, Jul 4, 2016 at 4:45 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> "brick" is allocated with devm_kzalloc() so freeing it with kfree()
> leads to a double free.  We can just delete it.

That makes perfect sense.

Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web