Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd5700ea authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: fix nouveau_client allocation failure path 



Depending on the point of failure, freed object would be returned
or memory leak would happen.

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 82c805ab

drivers/gpu/drm/nouveau/core/core/client.c

+1 −3
Original line number Diff line number Diff line
@@ -66,10 +66,8 @@ nouveau_client_create_(const char *name, u64 devname, const char *cfg, 


	ret = nouveau_handle_create(nv_object(client), ~0, ~0,

				    nv_object(client), &client->root);

	if (ret) {

		nouveau_namedb_destroy(&client->base);

	if (ret)

		return ret;

	}



	/* prevent init/fini being called, os in in charge of this */

	atomic_set(&nv_object(client)->usecount, 2);

drivers/gpu/drm/nouveau/core/include/core/client.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ nouveau_client(void *obj) 


int  nouveau_client_create_(const char *name, u64 device, const char *cfg,

			    const char *dbg, int, void **);

#define nouveau_client_destroy(p)                                              \

	nouveau_namedb_destroy(&(p)->base)



int  nouveau_client_init(struct nouveau_client *);

int  nouveau_client_fini(struct nouveau_client *, bool suspend);

drivers/gpu/drm/nouveau/nouveau_drm.c

+6 −1
Original line number Diff line number Diff line
@@ -84,11 +84,16 @@ nouveau_cli_create(struct pci_dev *pdev, const char *name, 
	struct nouveau_cli *cli;

	int ret;



	*pcli = NULL;

	ret = nouveau_client_create_(name, nouveau_name(pdev), nouveau_config,

				     nouveau_debug, size, pcli);

	cli = *pcli;

	if (ret)

	if (ret) {

		if (cli)

			nouveau_client_destroy(&cli->base);

		*pcli = NULL;

		return ret;

	}



	mutex_init(&cli->mutex);

	return 0;