Re: [Qemu-stable] [PATCH] nbd/client: Fix error messages during NBD_INFO_BLOCK_SIZE

[Vladimir Sementsov-Ogievskiy]

01.05.2018 18:46, Eric Blake wrote:
> A missing space makes for poor error messages.  Also, we missed
> diagnosing a server that sends a maximum block size less than
> the minimum.
>
> Fixes: 081dd1fe
> CC: address@hidden
> Signed-off-by: Eric Blake <address@hidden>

Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>

> ---
>   nbd/client.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/nbd/client.c b/nbd/client.c
> index 7f35b5c3232..7b3caa90ec2 100644
> --- a/nbd/client.c
> +++ b/nbd/client.c
> @@ -436,7 +436,7 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname,
>               be32_to_cpus(&info->min_block);
>               if (!is_power_of_2(info->min_block)) {
>                   error_setg(errp, "server minimum block size %" PRId32
> -                           "is not a power of two", info->min_block);
> +                           " is not a power of two", info->min_block);
>                   nbd_send_opt_abort(ioc);
>                   return -1;
>               }
> @@ -451,7 +451,7 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname,
>               if (!is_power_of_2(info->opt_block) ||
>                   info->opt_block < info->min_block) {
>                   error_setg(errp, "server preferred block size %" PRId32
> -                           "is not valid", info->opt_block);
> +                           " is not valid", info->opt_block);
>                   nbd_send_opt_abort(ioc);
>                   return -1;
>               }
> @@ -462,6 +462,12 @@ static int nbd_opt_go(QIOChannel *ioc, const char 
> *wantname,
>                   return -1;
>               }
>               be32_to_cpus(&info->max_block);
> +            if (info->max_block < info->min_block) {
> +                error_setg(errp, "server maximum block size %" PRId32
> +                           " is not valid", info->max_block);
> +                nbd_send_opt_abort(ioc);
> +                return -1;
> +            }
>               trace_nbd_opt_go_info_block_size(info->min_block, info->opt_block,
>                                                info->max_block);
>               break;


--
Best regards,
Vladimir