diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:40 +0800 |
| commit | b3f09bff3f6f291d4ef5d400426278856bf24c27 (patch) | |
| tree | d9b01ee6f510b32aacbed3487634218ece3fbfe2 /fs/proc/base.c | |
| parent | 334ca3ed18ded942e0220719f70b80eb20fa48ec (diff) | |
| parent | e37ddf27108a992e191b27df9bd532cb9157dc89 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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 57df8a52e780..23d60b1995fb 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -954,7 +954,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); |