Skip to content

Commit 12d0166

Browse files
committed
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()
2 parents 8cd3737 + 7a10d63 commit 12d0166

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,13 @@ static struct kfd_process *create_process(const struct task_struct *thread)
318318

319319
/* init process apertures*/
320320
process->is_32bit_user_mode = in_compat_syscall();
321-
if (kfd_init_apertures(process) != 0)
322-
goto err_init_apretures;
321+
err = kfd_init_apertures(process);
322+
if (err != 0)
323+
goto err_init_apertures;
323324

324325
return process;
325326

326-
err_init_apretures:
327+
err_init_apertures:
327328
pqm_uninit(&process->pqm);
328329
err_process_pqm_init:
329330
hash_del_rcu(&process->kfd_processes);

0 commit comments

Comments
 (0)