From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmLNs-0005m1-1s for qemu-devel@nongnu.org; Mon, 19 May 2014 07:05:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmLNm-0006OM-W2 for qemu-devel@nongnu.org; Mon, 19 May 2014 07:05:32 -0400 Message-ID: <5379E568.2020005@redhat.com> Date: Mon, 19 May 2014 13:05:12 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1400410205-26152-1-git-send-email-kroosec@gmail.com> <1400410205-26152-2-git-send-email-kroosec@gmail.com> In-Reply-To: <1400410205-26152-2-git-send-email-kroosec@gmail.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] nbd: Don't validate from and len in NBD_CMD_DISC. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hani Benhabiles , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, kwolf@redhat.com, stefanha@redhat.com Il 18/05/2014 12:50, Hani Benhabiles ha scritto: > These values aren't used in this case. > > Currently, the from field in the request sent by the nbd kernel module leading > to a false error message when ending the connection with the client. > > $ qemu-nbd some.img -v > // After nbd-client -d /dev/nbd0 > nbd.c:nbd_trip():L1031: From: 18446744073709551104, Len: 0, Size: 20971520, > Offset: 0 > nbd.c:nbd_trip():L1032: requested operation past EOF--bad client? > nbd.c:nbd_receive_request():L638: read failed > > Signed-off-by: Hani Benhabiles > --- > nbd.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/nbd.c b/nbd.c > index e5084b6..dc076d7 100644 > --- a/nbd.c > +++ b/nbd.c > @@ -1001,6 +1001,7 @@ static void nbd_trip(void *opaque) > struct nbd_request request; > struct nbd_reply reply; > ssize_t ret; > + uint32_t type; > > TRACE("Reading request."); > if (client->closing) { > @@ -1023,8 +1024,8 @@ static void nbd_trip(void *opaque) > reply.error = -ret; > goto error_reply; > } > - > - if ((request.from + request.len) > exp->size) { > + type = request.type & NBD_CMD_MASK_COMMAND; > + if (type != NBD_CMD_DISC && (request.from + request.len) > exp->size) { > LOG("From: %" PRIu64 ", Len: %u, Size: %" PRIu64 > ", Offset: %" PRIu64 "\n", > request.from, request.len, > @@ -1033,7 +1034,7 @@ static void nbd_trip(void *opaque) > goto invalid_request; > } > > - switch (request.type & NBD_CMD_MASK_COMMAND) { > + switch (type) { > case NBD_CMD_READ: > TRACE("Request type is READ"); > > Applied after renaming the variable from type to command (for consistency with e.g. nbd_co_receive_request). Paolo