- Revision
- 1952
- Author
- bernds
- Date
- 2007-11-22 15:57:28 -0600 (Thu, 22 Nov 2007)
Log Message
Upstream r18616 | kraj | 2007-05-15 02:37:02 +0200 (Tue, 15 May 2007) | 2 lines
Fix arm mmap when using mmap2 syscall.
Diffstat
libc/sysdeps/linux/arm/mmap.c | 11 ++++++++-
libc/sysdeps/linux/common/mmap64.c | 9 ++++++--
test/mmap/mmap2.c | 41 +++++++++++++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 4 deletions(-)
Modified Paths
Added Paths
Diff
Modified: trunk/uClibc/libc/sysdeps/linux/arm/mmap.c (1951 => 1952)
--- trunk/uClibc/libc/sysdeps/linux/arm/mmap.c 2007-11-22 21:56:26 UTC (rev 1951)
+++ trunk/uClibc/libc/sysdeps/linux/arm/mmap.c 2007-11-22 21:57:28 UTC (rev 1952)
@@ -27,7 +27,6 @@
#elif defined (__NR_mmap2)
#define __NR__mmap __NR_mmap2
-
#ifndef MMAP2_PAGE_SHIFT
# define MMAP2_PAGE_SHIFT 12
#endif
@@ -39,9 +38,17 @@
{
/* check if offset is page aligned */
if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
+ {
+ __set_errno(EINVAL);
return MAP_FAILED;
+ }
+#ifdef __USE_FILE_OFFSET64
return (__ptr_t) _mmap (addr, len, prot, flags,
- fd,(off_t) (offset >> MMAP2_PAGE_SHIFT));
+ fd,((__u_quad_t) offset >> MMAP2_PAGE_SHIFT));
+#else
+ return (__ptr_t) _mmap (addr, len, prot, flags,
+ fd,((__u_long) offset >> MMAP2_PAGE_SHIFT));
+#endif
}
#elif defined (__NR_mmap)
# define __NR__mmap __NR_mmap
Modified: trunk/uClibc/libc/sysdeps/linux/common/mmap64.c (1951 => 1952)
--- trunk/uClibc/libc/sysdeps/linux/common/mmap64.c 2007-11-22 21:56:26 UTC (rev 1951)
+++ trunk/uClibc/libc/sysdeps/linux/common/mmap64.c 2007-11-22 21:57:28 UTC (rev 1952)
@@ -58,8 +58,13 @@
__set_errno(EINVAL);
return MAP_FAILED;
}
-
- return __syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
+#ifdef __USE_FILE_OFFSET64
+ return __syscall_mmap2(addr, len, prot, flags,
+ fd,((__u_quad_t)offset >> MMAP2_PAGE_SHIFT));
+#else
+ return __syscall_mmap2(addr, len, prot, flags,
+ fd,((__ulong_t)offset >> MMAP2_PAGE_SHIFT));
+#endif
}
# endif
Added: trunk/uClibc/test/mmap/mmap2.c (0 => 1952)
--- trunk/uClibc/test/mmap/mmap2.c (rev 0)
+++ trunk/uClibc/test/mmap/mmap2.c 2007-11-22 21:57:28 UTC (rev 1952)
@@ -0,0 +1,41 @@
+/* When trying to map /dev/mem with offset 0xFFFFF000 on the ARM platform, mmap
+ * returns -EOVERFLOW.
+ *
+ * Since off_t is defined as a long int and the sign bit is set in the address,
+ * the shift operation shifts in ones instead of zeroes
+ * from the left. This results the offset sent to the kernel function becomes
+ * 0xFFFFFFFF instead of 0x000FFFFF with MMAP2_PAGE_SHIFT set to 12.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \
+ __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0)
+
+#define MAP_SIZE 4096UL
+#define MAP_MASK (MAP_SIZE - 1)
+
+int main(int argc, char **argv) {
+ void* map_base = 0;
+ int fd;
+ off_t target = 0xfffff000;
+ if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1) FATAL;
+ printf("/dev/mem opened.\n");
+ fflush(stdout);
+
+ /* Map one page */
+ map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
+ fd, target & ~MAP_MASK);
+ if(map_base == (void *) -1) FATAL;
+ printf("Memory mapped at address %p.\n", map_base);
+ fflush(stdout);
+ if(munmap(map_base, MAP_SIZE) == -1) FATAL;
+ close(fd);
+ return 0;
+}
