All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 2/9] block: handle invalid lseek returns gracefully
Date: Tue,  3 Apr 2018 18:33:53 +0200	[thread overview]
Message-ID: <20180403163400.6307-3-kwolf@redhat.com> (raw)
In-Reply-To: <20180403163400.6307-1-kwolf@redhat.com>

From: Jeff Cody <jcody@redhat.com>

In commit 223a23c198787328ae75bc65d84edf5fde33c0b6, we implemented a
workaround in the gluster driver to handle invalid values returned for
SEEK_DATA or SEEK_HOLE.

In some instances, these same invalid values can be seen in the posix
file handler as well - for example, it has been reported on FUSE gluster
mounts.

Calling assert() for these invalid values is overly harsh; we can safely
return -EIO and allow this case to be treated as a "learned nothing"
case (e.g., D4 / H4, as commented in the code).

This patch does the same thing that 223a23c198787 did for gluster.c,
except in file-posix.c

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index d7fb772c14..a2f6d8a8c8 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2114,7 +2114,12 @@ static int find_allocation(BlockDriverState *bs, off_t start,
     if (offs < 0) {
         return -errno;          /* D3 or D4 */
     }
-    assert(offs >= start);
+
+    if (offs < start) {
+        /* This is not a valid return by lseek().  We are safe to just return
+         * -EIO in this case, and we'll treat it like D4. */
+        return -EIO;
+    }
 
     if (offs > start) {
         /* D2: in hole, next data at offs */
@@ -2146,7 +2151,12 @@ static int find_allocation(BlockDriverState *bs, off_t start,
     if (offs < 0) {
         return -errno;          /* D1 and (H3 or H4) */
     }
-    assert(offs >= start);
+
+    if (offs < start) {
+        /* This is not a valid return by lseek().  We are safe to just return
+         * -EIO in this case, and we'll treat it like H4. */
+        return -EIO;
+    }
 
     if (offs > start) {
         /*
-- 
2.13.6

  parent reply	other threads:[~2018-04-03 16:34 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-03 16:33 [Qemu-devel] [PULL 0/9] Block layer patches for 2.12.0-rc2 Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 1/9] gluster: Fix blockdev-add with server.N.type=unix Kevin Wolf
2018-04-03 21:03   ` Jeff Cody
2018-04-04  9:54     ` Kevin Wolf
2018-04-03 16:33 ` Kevin Wolf [this message]
2018-04-03 16:33 ` [Qemu-devel] [PULL 3/9] iotests: Update 051 and 186 after commit 1454509726719e0933c Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 4/9] iotests: Update 186 after commit ac64273c66ab136c44043259162 Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 5/9] iotests: fix 208 for luks format Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 6/9] block/file-posix: Fix fully preallocated truncate Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 7/9] iotests: Test preallocated truncate of 2G image Kevin Wolf
2018-04-03 16:33 ` [Qemu-devel] [PULL 8/9] qemu-iotests: Use ppc64 qemu_arch on ppc64le host Kevin Wolf
2018-04-03 16:34 ` [Qemu-devel] [PULL 9/9] iotests: Test abnormally large size in compressed cluster descriptor Kevin Wolf
2018-04-04 14:40 ` [Qemu-devel] [PULL 0/9] Block layer patches for 2.12.0-rc2 Peter Maydell

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=20180403163400.6307-3-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@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.