diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
| commit | 4f797f56c3786e2c6bc542b3f80e9a599b073976 (patch) | |
| tree | 12f311ac2a06329d58d43437243a9b777c7822f4 /kernel/events/uprobes.c | |
| parent | c5105d764e0214bcc4c6d40d7ba231d01b2e9dda (diff) | |
| parent | 63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 (diff) | |
Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/uprobes.c')
| -rw-r--r-- | kernel/events/uprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index c74761004ee5..ece7e13f6e4a 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1457,7 +1457,7 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area) /* Try to map as high as possible, this is only a hint. */ area->vaddr = get_unmapped_area(NULL, TASK_SIZE - PAGE_SIZE, PAGE_SIZE, 0, 0); - if (area->vaddr & ~PAGE_MASK) { + if (IS_ERR_VALUE(area->vaddr)) { ret = area->vaddr; goto fail; } |