Re: [PATCH] autofs4 - detect invalid direct mount requests

[Ian Kent]

On Tue, 2008-07-01 at 14:17 -0700, Andrew Morton wrote:
> On Fri, 20 Jun 2008 13:13:03 +0800
> Ian Kent <raven@xxxxxxxxxx> wrote:
> 
> > autofs v5 dierct and offset mounts within an autofs filesystem are
> > triggered by existing autofs triger mounts so the mount point dentry
> > must be positive. If the mount point dentry is negative then the
> > trigger doesn't exist so we can return fail immediately.
> > 
> > Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
> > 
> > ---
> > 
> >  fs/autofs4/waitq.c |    4 ++++
> >  1 files changed, 4 insertions(+), 0 deletions(-)
> > 
> > 
> > diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
> > index cd21fd4..ae637d9 100644
> > --- a/fs/autofs4/waitq.c
> > +++ b/fs/autofs4/waitq.c
> > @@ -307,6 +307,10 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
> >  	if (sbi->catatonic)
> >  		return -ENOENT;
> >  
> > +	if (!dentry->d_inode &&
> > +	    (sbi->type & (AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET)))
> > +		return -ENOENT;
> > +
> >  	name = kmalloc(NAME_MAX + 1, GFP_KERNEL);
> >  	if (!name)
> >  		return -ENOMEM;
> 
> A good changelog would allow little old me to determine whether this
> patch should be merged into 2.6.25 and/or 2.6.26 and/or 2.6.27.  This
> wasn't a good changelog :(

Sorry, I guess I shouldn't have included it along with the other more
serious bug fixes. It gets rid of an annoyance more than anything as the
daemon still has to check for it.

It isn't important or urgent, just useful.

Ian



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/