diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-11-16 14:19:34 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-11-16 14:19:34 +0100 |
| commit | 7ce7f35b33eb42b6aa4cf176fa34372b21b8472b (patch) | |
| tree | 12f3027003f1d7cce30f838265e4fab2d52c6cef /fs/proc | |
| parent | x86/intel_rdt: Update percpu closid immeditately on CPUs affected by changee (diff) | |
| parent | x86/cpuid: Provide get_scattered_cpuid_leaf() (diff) | |
| download | linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.xz linux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.zip | |
Merge branch 'x86/cpufeature' into x86/cache
Resolve the cpu/scattered conflict.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index adfc5b4986f5..ca651ac00660 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1012,6 +1012,9 @@ static ssize_t auxv_read(struct file *file, char __user *buf, { struct mm_struct *mm = file->private_data; unsigned int nwords = 0; + + if (!mm) + return 0; do { nwords += 2; } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ |