From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935574AbcJ0Cvt (ORCPT ); Wed, 26 Oct 2016 22:51:49 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:49851 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932332AbcJ0Cvq (ORCPT ); Wed, 26 Oct 2016 22:51:46 -0400 X-ME-Sender: X-Sasl-enc: Ce98qcHFObSisIxDHeGqKRCUxanjI9iY5CoRV8f+uzlt 1477536705 Message-ID: <1477536700.2898.16.camel@themaw.net> Subject: Re: [PATCH 6/8] autofs - use path_is_mountpoint() to fix unreliable d_mountpoint() checks From: Ian Kent To: Al Viro Cc: Andrew Morton , autofs mailing list , Kernel Mailing List , "Eric W. Biederman" , linux-fsdevel , Omar Sandoval Date: Thu, 27 Oct 2016 10:51:40 +0800 In-Reply-To: <20161027021753.GJ19539@ZenIV.linux.org.uk> References: <20161011053352.27645.83962.stgit@pluto.themaw.net> <20161011053418.27645.15241.stgit@pluto.themaw.net> <20161027021753.GJ19539@ZenIV.linux.org.uk> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2016-10-27 at 03:17 +0100, Al Viro wrote: > On Tue, Oct 11, 2016 at 01:34:18PM +0800, Ian Kent wrote: > > > > + path = file->f_path; > > + > >   /* > >    * An empty directory in an autofs file system is always a > >    * mount point. The daemon must have failed to mount this > > @@ -123,7 +126,7 @@ static int autofs4_dir_open(struct inode *inode, struct > > file *file) > >    * it. > >    */ > >   spin_lock(&sbi->lookup_lock); > > - if (!d_mountpoint(dentry) && simple_empty(dentry)) { > > + if (!path_is_mountpoint(&path) && simple_empty(dentry)) { > Why not &file->f_path, provided that you constify that thing properly? Yep, my bad, as pointed out by Eric. Patches to fix that and constify a bunch of things will follow. > > > > > + if (rcu_walk) { > > + if (!path_is_mountpoint_rcu(path)) > > + return -EISDIR; > > + } else { > > + if (!path_is_mountpoint(path)) > > + return -EISDIR; > IDGI.  What's the point of _having_ the _rcu() variant, anyway?  Here you > are probably paying more in terms of i-cache footprint/branch prediction > than you win on not doing that rcu_read_lock()/rcu_read_unlock()... > > _rcu variants make sense when non-RCU case does something you can't do > under RCU; here your path_is_mountpoint() is pretty close to being > rcu_read_lock()+path_is_mountpoint_rcu()+rcu_read_unlock() anyway... Again, my bad, I'll merge these two and post along with the follow up patches above. Thanks Al, Ian