diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-01-13 22:08:03 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-02-12 21:32:04 +0100 |
| commit | a7d48886cacf8b426e0079bca9639d2657cf2d38 (patch) | |
| tree | ba45b820c900f3bd2f93a37d78bb77be3f93a106 /arch/um/include/shared/skas | |
| parent | 47da29763ec9a153b9b685bff9db659e4e09e494 (diff) | |
um: defer killing userspace on page table update failures
In some cases we can get to fix_range_common() with mmap_sem held,
and in others we get there without it being held. For example, we
get there with it held from sys_mprotect(), and without it held
from fork_handler().
Avoid any issues in this and simply defer killing the task until
it runs the next time. Do it on the mm so that another task that
shares the same mm can't continue running afterwards.
Cc: stable@vger.kernel.org
Fixes: 468f65976a8d ("um: Fix hung task in fix_range_common()")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/shared/skas')
| -rw-r--r-- | arch/um/include/shared/skas/mm_id.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/shared/skas/mm_id.h b/arch/um/include/shared/skas/mm_id.h index 4337b4ced095..e82e203f5f41 100644 --- a/arch/um/include/shared/skas/mm_id.h +++ b/arch/um/include/shared/skas/mm_id.h @@ -12,6 +12,7 @@ struct mm_id { int pid; } u; unsigned long stack; + int kill; }; #endif |