diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-31 13:52:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-31 13:52:03 +0100 |
| commit | 42e76456cf68dc828b8dbd3c7e255197e9b5e57d (patch) | |
| tree | 284bac556db55c9ffacbfcad371ece90cafaa856 /tests | |
| parent | 45a505d0a4b396a013ab086948a8ba6e76096bf4 (diff) | |
| parent | 5d9f3ea0817215ad4baac5aa30414e9ebbaaf0d6 (diff) | |
| download | qemu-42e76456cf68dc828b8dbd3c7e255197e9b5e57d.zip qemu-42e76456cf68dc828b8dbd3c7e255197e9b5e57d.tar.gz qemu-42e76456cf68dc828b8dbd3c7e255197e9b5e57d.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging
Fix safe_syscall() on ppc64 host
Fix mmap() 0 length error case
# gpg: Signature made Tue 31 Jul 2018 09:41:07 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-3.0-pull-request:
linux-user: ppc64: don't use volatile register during safe_syscall
tests: add check_invalid_maps to test-mmap
linux-user/mmap.c: handle invalid len maps correctly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tcg/multiarch/test-mmap.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c index 5c0afe6..11d0e77 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -27,7 +27,7 @@ #include <stdint.h> #include <string.h> #include <unistd.h> - +#include <errno.h> #include <sys/mman.h> #define D(x) @@ -435,6 +435,25 @@ void checked_write(int fd, const void *buf, size_t count) fail_unless(rc == count); } +void check_invalid_mmaps(void) +{ + unsigned char *addr; + + /* Attempt to map a zero length page. */ + addr = mmap(NULL, 0, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fprintf(stdout, "%s addr=%p", __func__, (void *)addr); + fail_unless(addr == MAP_FAILED); + fail_unless(errno == EINVAL); + + /* Attempt to map a over length page. */ + addr = mmap(NULL, -4, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fprintf(stdout, "%s addr=%p", __func__, (void *)addr); + fail_unless(addr == MAP_FAILED); + fail_unless(errno == ENOMEM); + + fprintf(stdout, " passed\n"); +} + int main(int argc, char **argv) { char tempname[] = "/tmp/.cmmapXXXXXX"; @@ -476,6 +495,7 @@ int main(int argc, char **argv) check_file_fixed_mmaps(); check_file_fixed_eof_mmaps(); check_file_unfixed_eof_mmaps(); + check_invalid_mmaps(); /* Fails at the moment. */ /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */ |