From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 8 Dec 2015 17:22:47 +0000 (-0500)
Subject: fix the regression from "direct-io: Fix negative return from dio read beyond eof"
X-Git-Tag: v4.3.5~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb5cfacf626064f41d8fc1a9d5bf51f02bbfdd78;p=thirdparty%2Fkernel%2Fstable.git

fix the regression from "direct-io: Fix negative return from dio read beyond eof"

commit 2d4594acbf6d8f75a27f3578476b6a27d8b13ebb upstream.

Sure, it's better to bail out of past-the-eof read and return 0 than return
a bogus negative value on such.  Only we'd better make sure we are bailing out
with 0 and not -ENOMEM...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 8897af41ae900..3e116320f01bc 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1167,6 +1167,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
 		if (dio->flags & DIO_LOCKING)
 			mutex_unlock(&inode->i_mutex);
 		kmem_cache_free(dio_cache, dio);
+		retval = 0;
 		goto out;
 	}