drm/nouveau: do not leak in nv20_graph_create
authorJesper Juhl <jj@chaosbits.net>
Sun, 3 Jul 2011 23:46:53 +0000 (09:46 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Sun, 24 Jul 2011 23:40:52 +0000 (09:40 +1000)
If we return due to an unknown chipset in
drivers/gpu/drm/nouveau/nv20_graph.c:nv20_graph_create() we'll leak the
memory allocated to 'pgraph'.

This patch should fix the leak.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Reviewed-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv20_graph.c

index affc7d7dd0291d1707a6e714eb5e57294fbcc807..f8736270f62f2c81760227f52e2175ae7f5cf145 100644 (file)
@@ -753,6 +753,7 @@ nv20_graph_create(struct drm_device *dev)
                        break;
                default:
                        NV_ERROR(dev, "PGRAPH: unknown chipset\n");
+                       kfree(pgraph);
                        return 0;
                }
        } else {
@@ -774,6 +775,7 @@ nv20_graph_create(struct drm_device *dev)
                        break;
                default:
                        NV_ERROR(dev, "PGRAPH: unknown chipset\n");
+                       kfree(pgraph);
                        return 0;
                }
        }