From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763133AbYGBJDH (ORCPT ); Wed, 2 Jul 2008 05:03:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751543AbYGBJCy (ORCPT ); Wed, 2 Jul 2008 05:02:54 -0400 Received: from out3.smtp.messagingengine.com ([66.111.4.27]:37867 "EHLO out3.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751507AbYGBJCx (ORCPT ); Wed, 2 Jul 2008 05:02:53 -0400 X-Sasl-enc: UdNtrRJfxNSk0NOGplUuqNSxbFMj4zv+IysyvILm3j5D 1214989372 Subject: Re: [PATCH] autofs4 - detect invalid direct mount requests From: Ian Kent To: Andrew Morton Cc: linux-kernel@vger.kernel.org, autofs@linux.kernel.org, linux-fsdevel@vger.kernel.org In-Reply-To: <20080701141715.62a2132b.akpm@linux-foundation.org> References: <20080620051301.9988.94307.stgit@raven.themaw.net> <20080701141715.62a2132b.akpm@linux-foundation.org> Content-Type: text/plain Date: Wed, 02 Jul 2008 16:59:50 +0800 Message-Id: <1214989192.3046.34.camel@raven.themaw.net> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-5.fc8) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2008-07-01 at 14:17 -0700, Andrew Morton wrote: > On Fri, 20 Jun 2008 13:13:03 +0800 > Ian Kent 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 > > > > --- > > > > 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