flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-25 00:36:16 +00:00
Code Issues Releases Wiki Activity

igt/gem_concurent_blit: Prevent a memleak if we assert whilst creating buffers

Browse Source 
Assume that we may halt partway through buffers_create() and so be
careful to clear up the partial state in buffers_destroy().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-03-20 11:13:30 +00:00
parent 3d8af56ed2
commit c19b049d9c
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/gem_concurrent_all.c
View File

@ -716,13 +716,28 @@ static void buffers_destroy(struct buffers *b)
if (count == 0) if (count == 0)
return; return;
for (int i = 0; i < count; i++) { /* Be safe so that we can clean up a partial creation */
b->mode->release_bo(b->src[i]);
b->mode->release_bo(b->dst[i]);
}
nop_release_bo(b->snoop);
b->mode->release_bo(b->spare);
b->count = 0; b->count = 0;
for (int i = 0; i < count; i++) {
if (b->src[i]) {
b->mode->release_bo(b->src[i]);
b->src[i] = NULL;
} else
break;
if (b->dst[i]) {
b->mode->release_bo(b->dst[i]);
b->dst[i] = NULL;
}
}
if (b->snoop) {
nop_release_bo(b->snoop);
b->snoop = NULL;
}
if (b->spare) {
b->mode->release_bo(b->spare);
b->spare = NULL;
}
} }
static void buffers_create(struct buffers *b) static void buffers_create(struct buffers *b)
@ -732,6 +747,7 @@ static void buffers_create(struct buffers *b)
buffers_destroy(b); buffers_destroy(b);
igt_assert(b->count == 0); igt_assert(b->count == 0);
b->count = count;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
b->src[i] = b->mode->create_bo(b); b->src[i] = b->mode->create_bo(b);
@ -739,7 +755,6 @@ static void buffers_create(struct buffers *b)
} }
b->spare = b->mode->create_bo(b); b->spare = b->mode->create_bo(b);
b->snoop = snoop_create_bo(b); b->snoop = snoop_create_bo(b);
b->count = count;
} }
static void buffers_fini(struct buffers *b) static void buffers_fini(struct buffers *b)