aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPeter Lieven <pl@kamp.de>2014-06-10 09:42:47 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-06-16 17:23:19 +0800
commita2c0fe2fd26e3e10753660019da9366f7b19c286 (patch)
treebff017734c531fe47ded4cc3a68bee632993a2d6 /block
parentae60e8e3783a66463d0736f3a48da9a66fd5cbd3 (diff)
block/nfs: fix potential segfault on early callback
it will happen in the future that the callback of a libnfs call directly invokes the callback. In this case we end up in a segfault because the NFSRPC is gone when we the BH is scheduled. Signed-off-by: Peter Lieven <pl@kamp.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/nfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/nfs.c b/block/nfs.c
index bd9177f3ae..e282f8de37 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -95,6 +95,7 @@ static void nfs_co_init_task(NFSClient *client, NFSRPC *task)
static void nfs_co_generic_bh_cb(void *opaque)
{
NFSRPC *task = opaque;
+ task->complete = 1;
qemu_bh_delete(task->bh);
qemu_coroutine_enter(task->co, NULL);
}
@@ -104,7 +105,6 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
void *private_data)
{
NFSRPC *task = private_data;
- task->complete = 1;
task->ret = ret;
if (task->ret > 0 && task->iov) {
if (task->ret <= task->iov->size) {
@@ -123,6 +123,8 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
task->bh = aio_bh_new(task->client->aio_context,
nfs_co_generic_bh_cb, task);
qemu_bh_schedule(task->bh);
+ } else {
+ task->complete = 1;
}
}