diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 14:38:38 +0200 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 14:38:38 +0200 |
| commit | 8bb9d758833ea1d0622277981b5225980ba0a42d (patch) | |
| tree | 2281499b2970e563f522db7ebc9d03bebfda4bfa /arch/x86/kernel/process_64.c | |
| parent | 0316046d152a1817bd0b4faff8e34c212a936a5e (diff) | |
| parent | 3b59d4725be760cd276094079b4fbe7bd44e1464 (diff) | |
Merge branch 'toradex_5.4-2.1.x-imx' into HEAD
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index af64519b2695..da3cc3a10d63 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -316,7 +316,7 @@ static unsigned long x86_fsgsbase_read_task(struct task_struct *task, */ mutex_lock(&task->mm->context.lock); ldt = task->mm->context.ldt; - if (unlikely(idx >= ldt->nr_entries)) + if (unlikely(!ldt || idx >= ldt->nr_entries)) base = 0; else base = get_desc_base(ldt->entries + idx); |