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

Commit 12d01662 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-2017-06-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next 

amdkfd fixes

* tag 'drm-amdkfd-next-2017-06-25' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Spelling s/apreture/aperture/
  drm/amdkfd: NULL dereference involving create_process()
parents 8cd37370 7a10d63f

drivers/gpu/drm/amd/amdkfd/kfd_process.c

+4 −3
Original line number Diff line number Diff line
@@ -318,12 +318,13 @@ static struct kfd_process *create_process(const struct task_struct *thread) 


	/* init process apertures*/

	process->is_32bit_user_mode = in_compat_syscall();

	if (kfd_init_apertures(process) != 0)

		goto err_init_apretures;

	err = kfd_init_apertures(process);

	if (err != 0)

		goto err_init_apertures;



	return process;



err_init_apretures:

err_init_apertures:

	pqm_uninit(&process->pqm);

err_process_pqm_init:

	hash_del_rcu(&process->kfd_processes);