2006-11-16 02:52:57

by Chris Wright

Subject: [patch 05/30] splice: fix problem introduced with inode diet

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Jens Axboe <[email protected]>

After the inode slimming patch that unionised i_pipe/i_bdev/i_cdev, it's
no longer enough to check for existance of ->i_pipe to verify that this
is a pipe.

Original patch from Eric Dumazet <[email protected]>
Final solution suggested by Linus.

Signed-off-by: Jens Axboe <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---

fs/splice.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)

--- linux-2.6.18.2.orig/fs/splice.c
+++ linux-2.6.18.2/fs/splice.c
@@ -1042,6 +1042,19 @@ out_release:
EXPORT_SYMBOL(do_splice_direct);

/*
+ * After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same
+ * location, so checking ->i_pipe is not enough to verify that this is a
+ * pipe.
+ */
+static inline struct pipe_inode_info *pipe_info(struct inode *inode)
+{
+ if (S_ISFIFO(inode->i_mode))
+ return inode->i_pipe;
+
+ return NULL;
+}
+
+/*
* Determine where to splice to/from.
*/
static long do_splice(struct file *in, loff_t __user *off_in,
@@ -1052,7 +1065,7 @@ static long do_splice(struct file *in, l
loff_t offset, *off;
long ret;

- pipe = in->f_dentry->d_inode->i_pipe;
+ pipe = pipe_info(in->f_dentry->d_inode);
if (pipe) {
if (off_in)
return -ESPIPE;
@@ -1073,7 +1086,7 @@ static long do_splice(struct file *in, l
return ret;
}

- pipe = out->f_dentry->d_inode->i_pipe;
+ pipe = pipe_info(out->f_dentry->d_inode);
if (pipe) {
if (off_out)
return -ESPIPE;
@@ -1231,7 +1244,7 @@ static int get_iovec_page_array(const st
static long do_vmsplice(struct file *file, const struct iovec __user *iov,
unsigned long nr_segs, unsigned int flags)
{
- struct pipe_inode_info *pipe = file->f_dentry->d_inode->i_pipe;
+ struct pipe_inode_info *pipe;
struct page *pages[PIPE_BUFFERS];
struct partial_page partial[PIPE_BUFFERS];
struct splice_pipe_desc spd = {
@@ -1241,7 +1254,8 @@ static long do_vmsplice(struct file *fil
.ops = &user_page_pipe_buf_ops,
};

- if (unlikely(!pipe))
+ pipe = pipe_info(file->f_dentry->d_inode);
+ if (!pipe)
return -EBADF;
if (unlikely(nr_segs > UIO_MAXIOV))
return -EINVAL;
@@ -1475,8 +1489,8 @@ static int link_pipe(struct pipe_inode_i
static long do_tee(struct file *in, struct file *out, size_t len,
unsigned int flags)
{
- struct pipe_inode_info *ipipe = in->f_dentry->d_inode->i_pipe;
- struct pipe_inode_info *opipe = out->f_dentry->d_inode->i_pipe;
+ struct pipe_inode_info *ipipe = pipe_info(in->f_dentry->d_inode);
+ struct pipe_inode_info *opipe = pipe_info(out->f_dentry->d_inode);
int ret = -EINVAL;

/*

--

2006-11-17 02:54:27

by Dave Jones

Subject: Re: [patch 05/30] splice: fix problem introduced with inode diet

On Wed, Nov 15, 2006 at 06:43:37PM -0800, Chris Wright wrote:
> -stable review patch. If anyone has any objections, please let us know.
> ------------------
>
> From: Jens Axboe <[email protected]>
>
> After the inode slimming patch that unionised i_pipe/i_bdev/i_cdev, it's
> no longer enough to check for existance of ->i_pipe to verify that this
> is a pipe.
>
> Original patch from Eric Dumazet <[email protected]>
> Final solution suggested by Linus.

2.6.18 didn't have the inode-diet patches.

[sidenote for the interested: they were in the Fedora 2.6.18 kernel, but I
picked this patch up already there]

Dave

--
http://www.codemonkey.org.uk

2006-11-17 06:16:20

by Chris Wright

Subject: Re: [stable] [patch 05/30] splice: fix problem introduced with inode diet

* Dave Jones ([email protected]) wrote:
> On Wed, Nov 15, 2006 at 06:43:37PM -0800, Chris Wright wrote:
> > -stable review patch. If anyone has any objections, please let us know.
> > ------------------
> >
> > From: Jens Axboe <[email protected]>
> >
> > After the inode slimming patch that unionised i_pipe/i_bdev/i_cdev, it's
> > no longer enough to check for existance of ->i_pipe to verify that this
> > is a pipe.
> >
> > Original patch from Eric Dumazet <[email protected]>
> > Final solution suggested by Linus.
>
> 2.6.18 didn't have the inode-diet patches.

Thanks, you're right, this is needless churn. Dropping.
-chris