diff options
| author | Richard Weinberger <richard@nod.at> | 2014-07-20 07:16:20 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2014-07-20 07:16:20 -0400 |
| commit | 468f65976a8d065ee1f27782337f4ee85a9151c5 (patch) | |
| tree | bf7325540763882142df28d23b4974e8e280d04b /arch | |
| parent | 284e6d39516cc7f9fbceebb259849fcb41559a7b (diff) | |
um: Fix hung task in fix_range_common()
If do_ops() fails we have to release current->mm->mmap_sem
otherwise the failing task will never terminate.
Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/tlb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 1fc619e5dfe9..f1b3eb14b855 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <mem_user.h> | 12 | #include <mem_user.h> |
| 13 | #include <os.h> | 13 | #include <os.h> |
| 14 | #include <skas.h> | 14 | #include <skas.h> |
| 15 | #include <kern_util.h> | ||
| 15 | 16 | ||
| 16 | struct host_vm_change { | 17 | struct host_vm_change { |
| 17 | struct host_vm_op { | 18 | struct host_vm_op { |
| @@ -286,8 +287,11 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
| 286 | /* This is not an else because ret is modified above */ | 287 | /* This is not an else because ret is modified above */ |
| 287 | if (ret) { | 288 | if (ret) { |
| 288 | printk(KERN_ERR "fix_range_common: failed, killing current " | 289 | printk(KERN_ERR "fix_range_common: failed, killing current " |
| 289 | "process\n"); | 290 | "process: %d\n", task_tgid_vnr(current)); |
| 291 | /* We are under mmap_sem, release it such that current can terminate */ | ||
| 292 | up_write(¤t->mm->mmap_sem); | ||
| 290 | force_sig(SIGKILL, current); | 293 | force_sig(SIGKILL, current); |
| 294 | do_signal(); | ||
| 291 | } | 295 | } |
| 292 | } | 296 | } |
| 293 | 297 | ||