Author: kan
Date: Thu Jun 10 17:59:47 2010
New Revision: 208994
URL: http://svn.freebsd.org/changeset/base/208994
Log:
Do not require pos parameter to be zero in MAP_ANONYMOUS mmap requests
in Linux emulation layer. Linux seems to only require that pos is
page-aligned, but otherwise ignores it. Default FreeBSD mmap parameter
checking is too strict to allow some Linux binaries to run. tsMuxeR is
one example of such a binary.
Discussed with: jhb
MFC after: 1 week
Modified:
head/sys/amd64/linux32/linux32_machdep.c
head/sys/i386/linux/linux_machdep.c
Modified: head/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- head/sys/amd64/linux32/linux32_machdep.c Thu Jun 10 17:53:35 2010
(r208993)
+++ head/sys/amd64/linux32/linux32_machdep.c Thu Jun 10 17:59:47 2010
(r208994)
@@ -835,9 +835,13 @@ linux_mmap_common(struct thread *td, l_u
bsd_args.flags |= MAP_PRIVATE;
if (flags & LINUX_MAP_FIXED)
bsd_args.flags |= MAP_FIXED;
- if (flags & LINUX_MAP_ANON)
+ if (flags & LINUX_MAP_ANON) {
+ /* Enforce pos to be on page boundary, then ignore. */
+ if ((pos & PAGE_MASK) != 0)
+ return (EINVAL);
+ pos = 0;
bsd_args.flags |= MAP_ANON;
- else
+ } else
bsd_args.flags |= MAP_NOSYNC;
if (flags & LINUX_MAP_GROWSDOWN)
bsd_args.flags |= MAP_STACK;
Modified: head/sys/i386/linux/linux_machdep.c
==============================================================================
--- head/sys/i386/linux/linux_machdep.c Thu Jun 10 17:53:35 2010
(r208993)
+++ head/sys/i386/linux/linux_machdep.c Thu Jun 10 17:59:47 2010
(r208994)
@@ -667,9 +667,13 @@ linux_mmap_common(struct thread *td, l_u
bsd_args.flags |= MAP_PRIVATE;
if (flags & LINUX_MAP_FIXED)
bsd_args.flags |= MAP_FIXED;
- if (flags & LINUX_MAP_ANON)
+ if (flags & LINUX_MAP_ANON) {
+ /* Enforce pos to be on page boundary, then ignore. */
+ if ((pos & PAGE_MASK) != 0)
+ return (EINVAL);
+ pos = 0;
bsd_args.flags |= MAP_ANON;
- else
+ } else
bsd_args.flags |= MAP_NOSYNC;
if (flags & LINUX_MAP_GROWSDOWN)
bsd_args.flags |= MAP_STACK;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
