yann@281: --- uClibc-0.9.29.oorig/test/mmap/mmap2.c	(revision 0)
yann@281: +++ uClibc-0.9.29/test/mmap/mmap2.c	(revision 18616)
yann@281: @@ -0,0 +1,41 @@
yann@281: +/* When trying to map /dev/mem with offset 0xFFFFF000 on the ARM platform, mmap
yann@281: + * returns -EOVERFLOW.
yann@281: + *
yann@281: + * Since off_t is defined as a long int and the sign bit is set in the address,
yann@281: + * the shift operation shifts in ones instead of zeroes
yann@281: + * from the left. This results the offset sent to the kernel function becomes
yann@281: + * 0xFFFFFFFF instead of 0x000FFFFF with MMAP2_PAGE_SHIFT set to 12.
yann@281: + */
yann@281: +
yann@281: +#include <unistd.h>
yann@281: +#include <stdio.h>
yann@281: +#include <stdlib.h>
yann@281: +#include <string.h>
yann@281: +#include <errno.h>
yann@281: +#include <fcntl.h>
yann@281: +#include <sys/mman.h>
yann@281: +
yann@281: +#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \
yann@281: +  __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0)
yann@281: +
yann@281: +#define MAP_SIZE 4096UL
yann@281: +#define MAP_MASK (MAP_SIZE - 1)
yann@281: +
yann@281: +int main(int argc, char **argv) {
yann@281: +    void* map_base = 0;
yann@281: +    int fd;
yann@281: +    off_t target = 0xfffff000;
yann@281: +    if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1) FATAL;
yann@281: +    printf("/dev/mem opened.\n");
yann@281: +    fflush(stdout);
yann@281: +
yann@281: +   /* Map one page */
yann@281: +    map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
yann@281: +                        fd, target & ~MAP_MASK);
yann@281: +    if(map_base == (void *) -1) FATAL;
yann@281: +    printf("Memory mapped at address %p.\n", map_base);
yann@281: +    fflush(stdout);
yann@281: +    if(munmap(map_base, MAP_SIZE) == -1) FATAL;
yann@281: +    close(fd);
yann@281: +    return 0;
yann@281: +}
yann@281: --- uClibc-0.9.29.oorig/libc/sysdeps/linux/arm/mmap.c	(revision 18615)
yann@281: +++ uClibc-0.9.29/libc/sysdeps/linux/arm/mmap.c	(revision 18616)
yann@281: @@ -27,7 +27,6 @@ __ptr_t mmap(__ptr_t addr, size_t len, i
yann@281:  
yann@281:  #elif defined  (__NR_mmap2)
yann@281:  #define __NR__mmap __NR_mmap2
yann@281: -
yann@281:  #ifndef MMAP2_PAGE_SHIFT
yann@281:  # define MMAP2_PAGE_SHIFT 12
yann@281:  #endif
yann@281: @@ -39,9 +38,17 @@ __ptr_t mmap(__ptr_t addr, size_t len, i
yann@281:  {
yann@281:    /* check if offset is page aligned */
yann@281:      if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
yann@281: +    {
yann@281: +        __set_errno(EINVAL);
yann@281:          return MAP_FAILED;
yann@281: +    }
yann@281: +#ifdef __USE_FILE_OFFSET64
yann@281: +  return (__ptr_t) _mmap (addr, len, prot, flags,
yann@281: +						  fd,((__u_quad_t) offset >> MMAP2_PAGE_SHIFT));
yann@281: +#else
yann@281:    return (__ptr_t) _mmap (addr, len, prot, flags,
yann@281: -						  fd,(off_t) (offset >> MMAP2_PAGE_SHIFT));
yann@281: +                          fd,((__u_long) offset >> MMAP2_PAGE_SHIFT));
yann@281: +#endif
yann@281:  }
yann@281:  #elif defined (__NR_mmap)
yann@281:  # define __NR__mmap __NR_mmap
yann@281: --- uClibc-0.9.29.oorig/libc/sysdeps/linux/common/mmap64.c	(revision 18615)
yann@281: +++ uClibc-0.9.29/libc/sysdeps/linux/common/mmap64.c	(revision 18616)
yann@281: @@ -58,8 +58,13 @@ __ptr_t mmap64(__ptr_t addr, size_t len,
yann@281:  		__set_errno(EINVAL);
yann@281:  		return MAP_FAILED;
yann@281:  	}
yann@281: -
yann@281: -	return __syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
yann@281: +#ifdef __USE_FILE_OFFSET64
yann@281: +  return __syscall_mmap2(addr, len, prot, flags,
yann@281: +                         fd,((__u_quad_t)offset >> MMAP2_PAGE_SHIFT));
yann@281: +#else
yann@281: +   return __syscall_mmap2(addr, len, prot, flags,
yann@291: +                          fd,((__u_long)offset >> MMAP2_PAGE_SHIFT));
yann@281: +#endif
yann@281:  }
yann@281:  
yann@281:  # endif