diff options
| author | Chris Wilson <ickle@braswell.alporthouse.com> | 2019-12-04 18:47:08 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-04 19:15:34 +0000 |
| commit | c11f328d1391d1e89c54755587de070672d3749f (patch) | |
| tree | b0ed0c9f0fe3b2b832f99e91dadd4c5732276c65 | |
| parent | cdbdf6a41367a7c4f5e8ce91bf45a7dcc750e640 (diff) | |
i915/gem_mmap_offset: Use the right fd for isolated offset generation
The offsets were meant to be created with the local fd, not i915!
Reported-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | tests/i915/gem_mmap_offset.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/i915/gem_mmap_offset.c b/tests/i915/gem_mmap_offset.c index 7c4088cd..95e1e3e6 100644 --- a/tests/i915/gem_mmap_offset.c +++ b/tests/i915/gem_mmap_offset.c @@ -207,7 +207,7 @@ static void isolation(int i915) b = gem_open(B, gem_flink(A, a)); mmap_arg.handle = a; - if (mmap_offset_ioctl(i915, &mmap_arg)) { + if (mmap_offset_ioctl(A, &mmap_arg)) { close(A); close(B); continue; @@ -215,7 +215,7 @@ static void isolation(int i915) offset_a = mmap_arg.offset; mmap_arg.handle = b; - igt_assert_eq(mmap_offset_ioctl(i915, &mmap_arg), 0); + igt_assert_eq(mmap_offset_ioctl(B, &mmap_arg), 0); offset_b = mmap_arg.offset; igt_info("A[%s]: {fd:%d, handle:%d, offset:%"PRIx64"}\n", @@ -223,11 +223,25 @@ static void isolation(int i915) igt_info("B[%s]: {fd:%d, handle:%d, offset:%"PRIx64"}\n", t->name, B, b, offset_b); + errno = 0; + ptr = mmap64(0, 4096, PROT_READ, MAP_SHARED, i915, offset_a); + igt_assert(ptr == MAP_FAILED); + igt_assert_eq(errno, EACCES); + + errno = 0; + ptr = mmap64(0, 4096, PROT_READ, MAP_SHARED, i915, offset_b); + igt_assert(ptr == MAP_FAILED); + igt_assert_eq(errno, EACCES); + + errno = 0; ptr = mmap64(0, 4096, PROT_READ, MAP_SHARED, B, offset_a); igt_assert(ptr == MAP_FAILED); + igt_assert_eq(errno, EACCES); + errno = 0; ptr = mmap64(0, 4096, PROT_READ, MAP_SHARED, A, offset_b); igt_assert(ptr == MAP_FAILED); + igt_assert_eq(errno, EACCES); close(B); |