diff mbox

nouveau: error paths leak in nvc0_graph_construct_context()

Message ID 20110625055446.GT14591@shale.localdomain (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter June 25, 2011, 5:54 a.m. UTC 
Two of these error paths returned without freeing "ctx".

Signed-off-by: Dan Carpenter <error27@gmail.com>

Comments

Ben Skeggs June 25, 2011, 12:08 p.m. UTC | #1 
On Sat, 2011-06-25 at 08:54 +0300, Dan Carpenter wrote:
> Two of these error paths returned without freeing "ctx".
Applied to nouveau git, thanks!

Ben.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
> index 39e9208..5aa3f9e 100644
> --- a/drivers/gpu/drm/nouveau/nvc0_graph.c
> +++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
> @@ -106,7 +106,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
>  		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
>  			NV_ERROR(dev, "PGRAPH: HUB_SET_CHAN timeout\n");
>  			nvc0_graph_ctxctl_debug(dev);
> -			return -EBUSY;
> +			ret = -EBUSY;
> +			goto err;
>  		}
>  	} else {
>  		nvc0_graph_load_context(chan);
> @@ -119,10 +120,9 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
>  	}
>  
>  	ret = nvc0_grctx_generate(chan);
> -	if (ret) {
> -		kfree(ctx);
> -		return ret;
> -	}
> +	if (ret)
> +		goto err;
> +
>  
>  	if (!nouveau_ctxfw) {
>  		nv_wr32(dev, 0x409840, 0x80000000);
> @@ -131,14 +131,13 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
>  		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
>  			NV_ERROR(dev, "PGRAPH: HUB_CTX_SAVE timeout\n");
>  			nvc0_graph_ctxctl_debug(dev);
> -			return -EBUSY;
> +			ret = -EBUSY;
> +			goto err;
>  		}
>  	} else {
>  		ret = nvc0_graph_unload_context_to(dev, chan->ramin->vinst);
> -		if (ret) {
> -			kfree(ctx);
> -			return ret;
> -		}
> +		if (ret)
> +			goto err;
>  	}
>  
>  	for (i = 0; i < priv->grctx_size; i += 4)
> @@ -146,6 +145,10 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
>  
>  	priv->grctx_vals = ctx;
>  	return 0;
> +
> +err:
> +	kfree(ctx);
> +	return ret;
>  }
>  
>  static int
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index 39e9208..5aa3f9e 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -106,7 +106,8 @@  nvc0_graph_construct_context(struct nouveau_channel *chan)
 		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
 			NV_ERROR(dev, "PGRAPH: HUB_SET_CHAN timeout\n");
 			nvc0_graph_ctxctl_debug(dev);
-			return -EBUSY;
+			ret = -EBUSY;
+			goto err;
 		}
 	} else {
 		nvc0_graph_load_context(chan);
@@ -119,10 +120,9 @@  nvc0_graph_construct_context(struct nouveau_channel *chan)
 	}
 
 	ret = nvc0_grctx_generate(chan);
-	if (ret) {
-		kfree(ctx);
-		return ret;
-	}
+	if (ret)
+		goto err;
+
 
 	if (!nouveau_ctxfw) {
 		nv_wr32(dev, 0x409840, 0x80000000);
@@ -131,14 +131,13 @@  nvc0_graph_construct_context(struct nouveau_channel *chan)
 		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
 			NV_ERROR(dev, "PGRAPH: HUB_CTX_SAVE timeout\n");
 			nvc0_graph_ctxctl_debug(dev);
-			return -EBUSY;
+			ret = -EBUSY;
+			goto err;
 		}
 	} else {
 		ret = nvc0_graph_unload_context_to(dev, chan->ramin->vinst);
-		if (ret) {
-			kfree(ctx);
-			return ret;
-		}
+		if (ret)
+			goto err;
 	}
 
 	for (i = 0; i < priv->grctx_size; i += 4)
@@ -146,6 +145,10 @@  nvc0_graph_construct_context(struct nouveau_channel *chan)
 
 	priv->grctx_vals = ctx;
 	return 0;
+
+err:
+	kfree(ctx);
+	return ret;
 }
 
 static int