]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - arch/x86/mm/mmap.c
x86/hugetlb: Adjust to the new native/compat mmap bases
authorDmitry Safonov <dsafonov@virtuozzo.com>
Tue, 14 Mar 2017 11:41:26 +0000 (14:41 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 14 Mar 2017 15:29:16 +0000 (16:29 +0100)
commite13b73dd9c8003993b171173ba803363faf74238
treee657a723cc2edffaf495d16f05652a43640c4f60
parent06c830a48346643e195801460dfe16d96ba4dff5
x86/hugetlb: Adjust to the new native/compat mmap bases

Commit 1b028f784e8c introduced two mmap() bases for 32-bit syscalls and for
64-bit syscalls. The mmap() code in x86 was modified to handle the
separation, but the patch series missed to update the hugetlb code.

As a consequence a 32bit application mapping a file on hugetlbfs uses the
64-bit mmap base for address space allocation, which fails.

Adjust the hugetlb mapping code to use the proper bases depending on the
syscall invocation mode (64-bit or compat).

[ tglx: Massaged changelog and switched from asm/compat.h to linux/compat.h ]

Fixes: commit 1b028f784e8c ("x86/mm: Introduce mmap_compat_base() for 32-bit mmap()")
Reported-by: kernel test robot <xiaolong.ye@intel.com>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Cc: 0x7f454c46@gmail.com
Cc: linux-mm@kvack.org
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Link: http://lkml.kernel.org/r/20170314114126.9280-1-dsafonov@virtuozzo.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/include/asm/elf.h
arch/x86/kernel/sys_x86_64.c
arch/x86/mm/hugetlbpage.c
arch/x86/mm/mmap.c