diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
commit | fe4c808f845e2ff3a3fb6c66009ab69c8d01bf57 (patch) | |
tree | 82ce8b6476c1c4c84ab05a49c94317f1ce8ac1b7 /fs/proc/base.c | |
parent | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (diff) | |
parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) |
Merge tag 'v3.18.37' into linux-linaro-lsk-v3.18lsk-v3.18-16.07
This is the 3.18.37 stable release
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 76b296fe93c9..dc98620634a3 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -752,7 +752,8 @@ static ssize_t environ_read(struct file *file, char __user *buf, int ret = 0; struct mm_struct *mm = file->private_data; - if (!mm) + /* Ensure the process spawned far enough to have an environment. */ + if (!mm || !mm->env_end) return 0; page = (char *)__get_free_page(GFP_TEMPORARY); |