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

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
...@@ -318,12 +318,13 @@ static struct kfd_process *create_process(const struct task_struct *thread) ...@@ -318,12 +318,13 @@ static struct kfd_process *create_process(const struct task_struct *thread)
/* init process apertures*/ /* init process apertures*/
process->is_32bit_user_mode = in_compat_syscall(); process->is_32bit_user_mode = in_compat_syscall();
if (kfd_init_apertures(process) != 0) err = kfd_init_apertures(process);
goto err_init_apretures; if (err != 0)
goto err_init_apertures;
return process; return process;
err_init_apretures: err_init_apertures:
pqm_uninit(&process->pqm); pqm_uninit(&process->pqm);
err_process_pqm_init: err_process_pqm_init:
hash_del_rcu(&process->kfd_processes); hash_del_rcu(&process->kfd_processes);
......
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