diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-11-26 11:08:24 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-11-26 15:26:14 +0100 |
| commit | de775f3a15daebcf191562fa0984f49497b76fd0 (patch) | |
| tree | 0d65008273c1c04226547a74fa7e915ae2e60b99 /tests | |
| parent | f48bebb15d3d2c1e6382e1f11b0aeac06fae6082 (diff) | |
tests: close(fd) without igt_fixture considered harmful
Some tests assume that close on an unopened fd is fine, except it's
not just unopened but actually stack garbage. There's a good chance we
end up running close(0), which wreaks the testcase enumeration. Fix
this.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Not sure there's a better way to catch this than git grep plus lots of
manual auditing ... The unit tests only catch it by accident (x86
works fine, I hit it in one testcase only cross-building to aarch64).
v2: Note that gem_pread_after_blit uses heap memory, so is actually
guaranteed to run close(0). Noticed by Jani.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/i915/gem_pread_after_blit.c | 3 | ||||
| -rw-r--r-- | tests/i915/gem_tiled_fence_blits.c | 3 | ||||
| -rw-r--r-- | tests/i915/gem_tiled_swapping.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c index 6ef3ca200..cee921274 100644 --- a/tests/i915/gem_pread_after_blit.c +++ b/tests/i915/gem_pread_after_blit.c @@ -248,5 +248,6 @@ igt_main drm_intel_bufmgr_destroy(bufmgr); } - close(fd); + igt_fixture + close(fd); } diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c index c02e35a5f..2453bcc0b 100644 --- a/tests/i915/gem_tiled_fence_blits.c +++ b/tests/i915/gem_tiled_fence_blits.c @@ -230,5 +230,6 @@ igt_main run_test(fd, count); } - close(fd); + igt_fixture + close(fd); } diff --git a/tests/i915/gem_tiled_swapping.c b/tests/i915/gem_tiled_swapping.c index dce668063..ddf2a748f 100644 --- a/tests/i915/gem_tiled_swapping.c +++ b/tests/i915/gem_tiled_swapping.c @@ -235,5 +235,6 @@ igt_main thread_fini(&threads[n]); } - close(fd); + igt_fixture + close(fd); } |