[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 06/12] nbd/server: Refactor zero-length optio
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH v6 06/12] nbd/server: Refactor zero-length option check |
Date: |
Mon, 30 Oct 2017 21:46:31 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 10/30/2017 09:11 PM, Eric Blake wrote:
> On 10/30/2017 06:22 PM, Vladimir Sementsov-Ogievskiy wrote:
>> 27.10.2017 13:40, Eric Blake wrote:
>>> Consolidate the response for a non-zero-length option payload
>>> into a new function, nbd_reject_length(). This check will
>>> also be used when introducing support for structured replies.
>>>
>>> + if (length) {
>>> + /* Unconditionally drop the connection if the client
>>> + * can't start a TLS negotiation correctly */
>>> + nbd_reject_length(client, length, option, true,
>>> errp);
>>> + return -EINVAL;
>>
>> why not to return nbd_reject_length's result? this EINVAL may not
>> correspond to errp (about EIO for example)..
>
> Somewhat true, if nbd_reject_length() fails. But nbd_reject_length() may
> also return 0 without setting errp, in which case, maybe this code
> should set errp rather than just blindly returning -EINVAL.
>
>>
>> with or without this fixed:
>>
>> Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
>>
>
> Okay, I'll squash this in, and include it in my pull request to be sent
> shortly.
D'oh. Long week for me. The whole reason I added a 'bool fatal'
parameter was so that I don't have to worry about nbd_reject_length()
returning 0. So it is instead better to just do:
> --- i/nbd/server.c
> +++ w/nbd/server.c
> @@ -684,8 +684,13 @@ static int nbd_negotiate_options(NBDClient *client,
> uint16_t myflags,
> if (length) {
> /* Unconditionally drop the connection if the client
> * can't start a TLS negotiation correctly */
> - nbd_reject_length(client, length, option, true, errp);
> - return -EINVAL;
> + return nbd_reject_length(client, length, option, true,
> + errp);
rather than repeating an error message.
--
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 v6 00/12] nbd minimal structured read, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 01/12] nbd: Include error names in trace messages, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 02/12] nbd: Move nbd_errno_to_system_errno() to public header, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 03/12] nbd: Expose constants and structs for structured read, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 05/12] nbd/server: Simplify nbd_negotiate_options loop, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 04/12] nbd/server: Report error for write to read-only export, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 06/12] nbd/server: Refactor zero-length option check, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 08/12] nbd/server: Include human-readable message in structured errors, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 07/12] nbd: Minimal structured read for server, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 09/12] nbd/client: refactor nbd_receive_starttls, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 10/12] nbd/client: prepare nbd_receive_reply for structured reply, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 11/12] nbd: Move nbd_read() to common header, Eric Blake, 2017/10/27
- [Qemu-devel] [PATCH v6 12/12] nbd: Minimal structured read for client, Eric Blake, 2017/10/27
- [Qemu-devel] [RFC PATCH v6 13/12] tweak test 83 verbosity, Eric Blake, 2017/10/27