diff options
| author | Dave Airlie | 2017-06-28 09:09:27 +0200 |
|---|---|---|
| committer | Dave Airlie | 2017-06-28 09:09:27 +0200 |
| commit | 12d016626f99f48edbf5b006625b4e8c0de1eec7 (patch) | |
| tree | a5f3c95ad1c80cfa8a6331468fa1f176f7ef1269 | |
| parent | Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into ... (diff) | |
| parent | drm/amdkfd: Spelling s/apreture/aperture/ (diff) | |
| download | kernel-qcow2-linux-12d016626f99f48edbf5b006625b4e8c0de1eec7.tar.gz kernel-qcow2-linux-12d016626f99f48edbf5b006625b4e8c0de1eec7.tar.xz kernel-qcow2-linux-12d016626f99f48edbf5b006625b4e8c0de1eec7.zip | |
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()
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 84d1ffd1eef9..035bbc98a63d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -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); |