diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-17 12:51:17 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-17 12:51:17 +0800 |
| commit | 127f7fb4c452328fa24f4c29eb403a97c5f7ea8c (patch) | |
| tree | f76942e04ec3ca226503c74b0c04130ffb7d4c4c /fs/userfaultfd.c | |
| parent | fa6e6c7406806f9d4119703e4c3ad661c25b99ee (diff) | |
| parent | 6d0b88c88bf58bfd89ffbdaa97b03617fe8c6478 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'fs/userfaultfd.c')
| -rw-r--r-- | fs/userfaultfd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 68a62457e685..d473e6e07a7e 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -287,6 +287,12 @@ int handle_userfault(struct vm_area_struct *vma, unsigned long address, goto out; /* + * We don't do userfault handling for the final child pid update. + */ + if (current->flags & PF_EXITING) + goto out; + + /* * Check that we can return VM_FAULT_RETRY. * * NOTE: it should become possible to return VM_FAULT_RETRY |