Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965939AbbEMWbn (ORCPT ); Wed, 13 May 2015 18:31:43 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:44905 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964916AbbEMW0S (ORCPT ); Wed, 13 May 2015 18:26:18 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 11/21] namei: make filename_lookup() reject ERR_PTR() passed as name Date: Wed, 13 May 2015 23:26:05 +0100 Message-Id: <1431555975-25997-11-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150513222533.GA24192@ZenIV.linux.org.uk> References: <20150513222533.GA24192@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2489 Lines: 80 From: Al Viro makes for much easier life in callers Signed-off-by: Al Viro --- fs/namei.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index abf65b0..6607a05 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2120,7 +2120,10 @@ static int filename_lookup(int dfd, struct filename *name, unsigned flags, struct path *path, struct path *root) { int retval; - struct nameidata nd, *saved_nd = set_nameidata(&nd); + struct nameidata nd, *saved_nd; + if (IS_ERR(name)) + return PTR_ERR(name); + saved_nd = set_nameidata(&nd); if (unlikely(root)) { nd.root = *root; flags |= LOOKUP_ROOT; @@ -2210,10 +2213,8 @@ out: int kern_path(const char *name, unsigned int flags, struct path *path) { - struct filename *filename = getname_kernel(name); - if (IS_ERR(filename)) - return PTR_ERR(filename); - return filename_lookup(AT_FDCWD, filename, flags, path, NULL); + return filename_lookup(AT_FDCWD, getname_kernel(name), + flags, path, NULL); } EXPORT_SYMBOL(kern_path); @@ -2230,15 +2231,9 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, struct path *path) { struct path root = {.mnt = mnt, .dentry = dentry}; - struct filename *filename = getname_kernel(name); - - BUG_ON(flags & LOOKUP_PARENT); - - if (IS_ERR(filename)) - return PTR_ERR(filename); - /* the first argument of filename_lookup() is ignored with root */ - return filename_lookup(AT_FDCWD, filename, flags , path, &root); + return filename_lookup(AT_FDCWD, getname_kernel(name), + flags , path, &root); } EXPORT_SYMBOL(vfs_path_lookup); @@ -2296,13 +2291,8 @@ EXPORT_SYMBOL(lookup_one_len); int user_path_at_empty(int dfd, const char __user *name, unsigned flags, struct path *path, int *empty) { - struct filename *tmp = getname_flags(name, flags, empty); - if (IS_ERR(tmp)) - return PTR_ERR(tmp); - - BUG_ON(flags & LOOKUP_PARENT); - - return filename_lookup(dfd, tmp, flags, path, NULL); + return filename_lookup(dfd, getname_flags(name, flags, empty), + flags, path, NULL); } int user_path_at(int dfd, const char __user *name, unsigned flags, -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/