ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spdk_dd: Fix SEGV on the error path.

Browse Source 
We can see this app using dd_exit to cleanup.
Some error cases:
spdk_bdev_get_io_channel failed for -ENOMEM,
or it results in dd_open_bdev failed and then
dd_exit.

For a bdev, dd_exit does cleanup using spdk_put_io_channel.
And spdk_put_io_channel allows `ch == NULL`.
This causes SEGV.

So here add a separate function to check ch, and put
cleanup together.

This is found by xnvme pre-test.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: I9dd860da250a86f52139e69c690dd257a7ff7717
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14195
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
This commit is contained in:
yidong0635 2022-08-25 13:40:40 +08:00 committed by Tomasz Zawadzki
parent 43c5293e16
commit a929fa0417
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/spdk_dd/spdk_dd.c
View File

@ -144,6 +144,19 @@ static bool g_interrupt;
static void dd_target_populate_buffer(struct dd_io *io); static void dd_target_populate_buffer(struct dd_io *io);
static void
dd_cleanup_bdev(struct dd_target io)
{
/* This can be only on the error path.
* To prevent the SEGV, need add checks here.
*/
if (io.u.bdev.ch) {
spdk_put_io_channel(io.u.bdev.ch);
}
spdk_bdev_close(io.u.bdev.desc);
}
static void static void
dd_exit(int rc) dd_exit(int rc)
{ {
@ -157,8 +170,7 @@ dd_exit(int rc)
close(g_job.input.u.aio.fd); close(g_job.input.u.aio.fd);
} }
} else if (g_job.input.type == DD_TARGET_TYPE_BDEV && g_job.input.open) { } else if (g_job.input.type == DD_TARGET_TYPE_BDEV && g_job.input.open) {
spdk_put_io_channel(g_job.input.u.bdev.ch); dd_cleanup_bdev(g_job.input);
spdk_bdev_close(g_job.input.u.bdev.desc);
} }
if (g_job.output.type == DD_TARGET_TYPE_FILE) { if (g_job.output.type == DD_TARGET_TYPE_FILE) {
@ -171,8 +183,7 @@ dd_exit(int rc)
close(g_job.output.u.aio.fd); close(g_job.output.u.aio.fd);
} }
} else if (g_job.output.type == DD_TARGET_TYPE_BDEV && g_job.output.open) { } else if (g_job.output.type == DD_TARGET_TYPE_BDEV && g_job.output.open) {
spdk_put_io_channel(g_job.output.u.bdev.ch); dd_cleanup_bdev(g_job.output);
spdk_bdev_close(g_job.output.u.bdev.desc);
} }
if (g_job.input.type == DD_TARGET_TYPE_FILE || g_job.output.type == DD_TARGET_TYPE_FILE) { if (g_job.input.type == DD_TARGET_TYPE_FILE || g_job.output.type == DD_TARGET_TYPE_FILE) {