[154/205] splice: check f_mode for seekable file
in [Kernel]
|
Prev: [144/205] drm/i915: dont queue flips during a flip pending event
Next: [169/205] dm9000: fix "BUG: spinlock recursion"
From: Greg KH on 30 Jul 2010 14:00 2.6.34-stable review patch. If anyone has any objections, please let us know. ------------------ From: Changli Gao <xiaosuo(a)gmail.com> commit 19c9a49b432f245c6293508d164a4350f1f2c601 upstream. 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: Changli Gao <xiaosuo(a)gmail.com> Signed-off-by: Miklos Szeredi <mszeredi(a)suse.cz> Signed-off-by: Jens Axboe <jaxboe(a)fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/splice.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/fs/splice.c +++ b/fs/splice.c @@ -1322,8 +1322,7 @@ static long do_splice(struct file *in, l 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; @@ -1343,8 +1342,7 @@ static long do_splice(struct file *in, l 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |