diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-05 10:59:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-05 10:59:47 +0200 |
| commit | 8e02ae573e6ae86930d08662790827a938203e70 (patch) | |
| tree | ef87732e10e1c4162c45774274da07b32bee32ef /kernel/events/uprobes.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | uprobes: Refuse to insert a probe into MAP_SHARED vma (diff) | |
| download | linux-8e02ae573e6ae86930d08662790827a938203e70.tar.xz linux-8e02ae573e6ae86930d08662790827a938203e70.zip | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/uprobes
Pull uprobes updates from Oleg Nesterov:
"This hopefully completes the previous 'fix the handling of relative
jmp/call's' series, all changes except the last 3 unrelated fixes try
to address TODO's mentioned in the changelogs."
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 d1edc5e6fd03..7716c40f2c50 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -127,7 +127,7 @@ struct xol_area { */ static bool valid_vma(struct vm_area_struct *vma, bool is_register) { - vm_flags_t flags = VM_HUGETLB | VM_MAYEXEC | VM_SHARED; + vm_flags_t flags = VM_HUGETLB | VM_MAYEXEC | VM_MAYSHARE; if (is_register) flags |= VM_WRITE; |