Commit 60f7ab06 authored by Dan Carpenter's avatar Dan Carpenter Committed by Ben Skeggs

drm/nouveau: error paths leak in nvc0_graph_construct_context()

Two of these error paths returned without freeing "ctx".
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3b40d07d
...@@ -106,7 +106,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) ...@@ -106,7 +106,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) { if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
NV_ERROR(dev, "PGRAPH: HUB_SET_CHAN timeout\n"); NV_ERROR(dev, "PGRAPH: HUB_SET_CHAN timeout\n");
nvc0_graph_ctxctl_debug(dev); nvc0_graph_ctxctl_debug(dev);
return -EBUSY; ret = -EBUSY;
goto err;
} }
} else { } else {
nvc0_graph_load_context(chan); nvc0_graph_load_context(chan);
...@@ -119,10 +120,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) ...@@ -119,10 +120,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
} }
ret = nvc0_grctx_generate(chan); ret = nvc0_grctx_generate(chan);
if (ret) { if (ret)
kfree(ctx); goto err;
return ret;
}
if (!nouveau_ctxfw) { if (!nouveau_ctxfw) {
nv_wr32(dev, 0x409840, 0x80000000); nv_wr32(dev, 0x409840, 0x80000000);
...@@ -131,14 +130,13 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) ...@@ -131,14 +130,13 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) { if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {
NV_ERROR(dev, "PGRAPH: HUB_CTX_SAVE timeout\n"); NV_ERROR(dev, "PGRAPH: HUB_CTX_SAVE timeout\n");
nvc0_graph_ctxctl_debug(dev); nvc0_graph_ctxctl_debug(dev);
return -EBUSY; ret = -EBUSY;
goto err;
} }
} else { } else {
ret = nvc0_graph_unload_context_to(dev, chan->ramin->vinst); ret = nvc0_graph_unload_context_to(dev, chan->ramin->vinst);
if (ret) { if (ret)
kfree(ctx); goto err;
return ret;
}
} }
for (i = 0; i < priv->grctx_size; i += 4) for (i = 0; i < priv->grctx_size; i += 4)
...@@ -146,6 +144,10 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) ...@@ -146,6 +144,10 @@ nvc0_graph_construct_context(struct nouveau_channel *chan)
priv->grctx_vals = ctx; priv->grctx_vals = ctx;
return 0; return 0;
err:
kfree(ctx);
return ret;
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment