Re: [Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path

[Eric Blake]

On 05/30/2017 09:30 AM, Vladimir Sementsov-Ogievskiy wrote:
> Current code will return 0 on this write_sync fail, as rc is 0
> after successful nbd_negotiate_options. Fix this.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>  nbd/server.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Eric Blake 

> diff --git a/nbd/server.c b/nbd/server.c
> index 3d4cd3d21c..984fad4bdb 100644
> --- a/nbd/server.c
> +++ b/nbd/server.c
> @@ -607,7 +607,8 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
>  stq_be_p(buf + 18, client->exp->size);
>  stw_be_p(buf + 26, client->exp->nbdflags | myflags);
>  len = client->no_zeroes ? 10 : sizeof(buf) - 18;
> -if (write_sync(client->ioc, buf + 18, len, NULL) < 0) {
> +rc = write_sync(client->ioc, buf + 18, len, NULL);
> +if (rc < 0) {
>  LOG("write failed");
>  goto fail;
>  }
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3266
Virtualization:  qemu.org | libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path

[Vladimir Sementsov-Ogievskiy]

Current code will return 0 on this write_sync fail, as rc is 0
after successful nbd_negotiate_options. Fix this.

Signed-off-by: Vladimir Sementsov-Ogievskiy 
---
 nbd/server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nbd/server.c b/nbd/server.c
index 3d4cd3d21c..984fad4bdb 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -607,7 +607,8 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
 stq_be_p(buf + 18, client->exp->size);
 stw_be_p(buf + 26, client->exp->nbdflags | myflags);
 len = client->no_zeroes ? 10 : sizeof(buf) - 18;
-if (write_sync(client->ioc, buf + 18, len, NULL) < 0) {
+rc = write_sync(client->ioc, buf + 18, len, NULL);
+if (rc < 0) {
 LOG("write failed");
 goto fail;
 }
-- 
2.11.1