Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19c9a49b authored by Changli Gao's avatar Changli Gao Committed by Jens Axboe
Browse files

splice: check f_mode for seekable file 



check f_mode for seekable file

As a seekable file is allowed without a llseek function, so the old way isn't
work any more.

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
----
 fs/splice.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 2cb4b05e

fs/splice.c

+2 −4
Original line number Diff line number Diff line
@@ -1372,8 +1372,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, 
		if (off_in)

			return -ESPIPE;

		if (off_out) {

			if (!out->f_op || !out->f_op->llseek ||

			    out->f_op->llseek == no_llseek)

			if (!(out->f_mode & FMODE_PWRITE))

				return -EINVAL;

			if (copy_from_user(&offset, off_out, sizeof(loff_t)))

				return -EFAULT;
@@ -1393,8 +1392,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, 
		if (off_out)

			return -ESPIPE;

		if (off_in) {

			if (!in->f_op || !in->f_op->llseek ||

			    in->f_op->llseek == no_llseek)

			if (!(in->f_mode & FMODE_PREAD))

				return -EINVAL;

			if (copy_from_user(&offset, off_in, sizeof(loff_t)))

				return -EFAULT;