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

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
...@@ -1372,8 +1372,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, ...@@ -1372,8 +1372,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
if (off_in) if (off_in)
return -ESPIPE; return -ESPIPE;
if (off_out) { if (off_out) {
if (!out->f_op || !out->f_op->llseek || if (!(out->f_mode & FMODE_PWRITE))
out->f_op->llseek == no_llseek)
return -EINVAL; return -EINVAL;
if (copy_from_user(&offset, off_out, sizeof(loff_t))) if (copy_from_user(&offset, off_out, sizeof(loff_t)))
return -EFAULT; return -EFAULT;
...@@ -1393,8 +1392,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, ...@@ -1393,8 +1392,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
if (off_out) if (off_out)
return -ESPIPE; return -ESPIPE;
if (off_in) { if (off_in) {
if (!in->f_op || !in->f_op->llseek || if (!(in->f_mode & FMODE_PREAD))
in->f_op->llseek == no_llseek)
return -EINVAL; return -EINVAL;
if (copy_from_user(&offset, off_in, sizeof(loff_t))) if (copy_from_user(&offset, off_in, sizeof(loff_t)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment