block/nfs: fix potential segfault on early callback
PATCH 1/1 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 <[email protected]>
--- block/nfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/nfs.c +3 -1
@@ -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 ; } }
Signature · 1 line
1.7.9.5
Stefan Hajnoczi
AppliedQuoted 8 lines · Peter Lieven
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 <[email protected]>--- block/nfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan