diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 257db2460ab8..6a3a5fa1526d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -220,7 +220,6 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key) struct mm_struct *mm = current->mm; struct page *page; int err; - struct vm_area_struct *vma; /* * The futex address must be "naturally" aligned. @@ -246,37 +245,6 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key) return 0; } - /* - * The futex is hashed differently depending on whether - * it's in a shared or private mapping. So check vma first. - */ - vma = find_extend_vma(mm, address); - if (unlikely(!vma)) - return -EFAULT; - - /* - * Permissions. - */ - if (unlikely((vma->vm_flags & (VM_IO|VM_READ)) != VM_READ)) - return (vma->vm_flags & VM_IO) ? -EPERM : -EACCES; - - /* - * Private mappings are handled in a simple way. - * - * NOTE: When userspace waits on a MAP_SHARED mapping, even if - * it's a read-only handle, it's expected that futexes attach to - * the object not the particular process. Therefore we use - * VM_MAYSHARE here, not VM_SHARED which is restricted to shared - * mappings of _writable_ handles. - */ - if (likely(!(vma->vm_flags & VM_MAYSHARE))) { - key->both.offset |= FUT_OFF_MMSHARED; /* reference taken on mm */ - key->private.mm = mm; - key->private.address = address; - get_futex_key_refs(key); - return 0; - } - again: err = get_user_pages_fast(address, 1, 1, &page); if (err < 0) |