Merge tag 'fuse-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

b910f6a7 · Linus Torvalds <[email protected]> · 2019-06-20 14:16:16 -07:00

Pull fuse fix from Miklos Szeredi:
 "Just a single revert, fixing a regression in -rc1"

* tag 'fuse-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  Revert "fuse: require /dev/fuse reads to have enough buffer capacity"

Commit: b910f6a7ccab60b4d930b438a97a265bb2b33135
Parents: b3e97833 · 766741fc

Merge commit. Changes below are compared with the first parent: b3e97833.

Changes

1 files changed · +0 −10

File	Status	Add	Del	Content
fs/fuse/dev.c	modified	+0	−10	View file

fs/fuse/dev.c

View file

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 24ea19c..ea82375 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1317,16 +1317,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
 	unsigned reqsize;
 	unsigned int hash;
 
-	/*
-	 * Require sane minimum read buffer - that has capacity for fixed part
-	 * of any request header + negotated max_write room for data. If the
-	 * requirement is not satisfied return EINVAL to the filesystem server
-	 * to indicate that it is not following FUSE server/client contract.
-	 * Don't dequeue / abort any request.
-	 */
-	if (nbytes < max_t(size_t, FUSE_MIN_READ_BUFFER, 4096 + fc->max_write))
-		return -EINVAL;
-
  restart:
 	spin_lock(&fiq->waitq.lock);
 	err = -EAGAIN;