From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric W. Biederman" Subject: [PATCH 10/23] vfs: Teach do_path_lookup to use file_hotplug_lock Date: Mon, 1 Jun 2009 14:50:35 -0700 Message-ID: <1243893048-17031-10-git-send-email-ebiederm@xmission.com> References: Cc: , , , , Hugh Dickins , Tejun Heo , Alexey Dobriyan , Linus Torvalds , Alan Cox , Greg Kroah-Hartman , Nick Piggin , Andrew Morton , Christoph Hellwig , "Eric W. Biederman" , "Eric W. Biederman" To: Al Viro Return-path: Received: from out02.mta.xmission.com ([166.70.13.232]:35876 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891AbZFAVu7 (ORCPT ); Mon, 1 Jun 2009 17:50:59 -0400 In-Reply-To: Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Eric W. Biederman Signed-off-by: Eric W. Biederman --- fs/namei.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 5472ed0..c4c6575 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1049,23 +1049,30 @@ static int path_init(int dfd, const char *name, unsigned int flags, struct namei if (!file) goto out_fail; + retval = -EIO; + if (!file_hotplug_read_trylock(file)) + goto fput_fail; + dentry = file->f_path.dentry; retval = -ENOTDIR; if (!S_ISDIR(dentry->d_inode->i_mode)) - goto fput_fail; + goto unlock_fail; retval = file_permission(file, MAY_EXEC); if (retval) - goto fput_fail; + goto unlock_fail; nd->path = file->f_path; path_get(&file->f_path); + file_hotplug_read_unlock(file); fput_light(file, fput_needed); } return 0; +unlock_fail: + file_hotplug_read_unlock(file); fput_fail: fput_light(file, fput_needed); out_fail: -- 1.6.3.1.54.g99dd.dirty