From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, Hani Benhabiles <kroosec@gmail.com>
Subject: [Qemu-devel] [PULL 2/5] nbd: Don't validate from and len in NBD_CMD_DISC.
Date: Fri, 27 Jun 2014 16:11:43 +0200 [thread overview]
Message-ID: <1403878306-22683-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1403878306-22683-1-git-send-email-pbonzini@redhat.com>
From: Hani Benhabiles <kroosec@gmail.com>
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 <kroosec@gmail.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
nbd.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/nbd.c b/nbd.c
index e0d032c..8d8bc40 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 command;
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) {
+ command = request.type & NBD_CMD_MASK_COMMAND;
+ if (command != 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 (command) {
case NBD_CMD_READ:
TRACE("Request type is READ");
--
1.8.3.1
next prev parent reply other threads:[~2014-06-27 14:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-27 14:11 [Qemu-devel] [PULL 0/5] NBD changes for 2014-06-27 Paolo Bonzini
2014-06-27 14:11 ` [Qemu-devel] [PULL 1/5] nbd: Don't export a block device with no medium Paolo Bonzini
2014-06-27 14:11 ` Paolo Bonzini [this message]
2014-06-27 14:11 ` [Qemu-devel] [PULL 3/5] nbd: Shutdown socket before closing Paolo Bonzini
2014-06-27 14:11 ` [Qemu-devel] [PULL 4/5] nbd: Handle fixed new-style clients Paolo Bonzini
2014-06-27 14:11 ` [Qemu-devel] [PULL 5/5] nbd: Handle NBD_OPT_LIST option Paolo Bonzini
2014-06-29 11:45 ` [Qemu-devel] [PULL 0/5] NBD changes for 2014-06-27 Peter Maydell
2014-06-29 11:55 ` Hani Benhabiles
2014-06-30 12:36 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403878306-22683-3-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=kroosec@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.