[patch 05/14] vfs: add path_create() and path_mknod()

From: Miklos Szeredi
Date: Tue Jul 22 2008 - 18:14:54 EST

From: Miklos Szeredi <mszeredi@xxxxxxx>

R/O bind mounts require operations which modify the filesystem to be
wrapped in mnt_want_write()/mnt_drop_write(). Create helpers which do
this, so callers won't need to bother, and more importantly, cannot
forget! Call these path_*, analogous to vfs_*. Since there are no
callers of vfs_* left, make them static.

Overall this patchset is just 23 lines in the red, but at the same
time it fixes several places in nfsd and the whole of ecryptfs, where
the mnt_want_write/drop_write() calls were missing.

It will also help with merging certain security modules, which need to
know the path within the namespace, and not just within the
filesystem. These helpers will allow the security hooks to be in a
common place, and need not be repeated in all callers.

Note, that the mnt_want_write/drop_write() bracketing provided by the
path_* functions is not strictly necessary in all cases, since the
caller may do it's own bracketing to span multiple VFS calls.
However, this does not make the checks in path_* incorrect, just
redundant.

The advantages of the path_* API are:

- it's consistent

- it provides some (not all) guarantees, i.e. it's easier to prove
that all callers play by the rules

- for the syscall case it has zero cost

- for all the other cases it has either zero, or minimal cost

It does require the caller to have a vfsmount available, but it's hard
to imagine that the caller does not have it:

- most userspace calls do have it, as they are either operating on a
path or a file descriptor. There are some exceptions like sync(2)
and ustat(2), the latter not being a very exemplary interface, and
neither of them being relevant to this discussion.

- all kernel callers (nfs export, stacking) should have it, as they
need it for open() anyway

And even if some theoretical caller didn't have the vfsmount, it still
should be easy to allocate one, providing a clean way to do the r/o
bracketing, and not requiring another mechanism to be exported that
provides the same functionality on the superblock.


This patch:

Introduce path_create() and path_mknod(). Make vfs_create() and
vfs_mknod() static.

Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
---
fs/ecryptfs/inode.c | 33 ++++++++++------------
fs/namei.c | 75 +++++++++++++++++++++++++++-------------------------
fs/nfsd/vfs.c | 19 +++++++++----
include/linux/fs.h | 4 +-
ipc/mqueue.c | 6 +++-
net/unix/af_unix.c | 6 ----
6 files changed, 76 insertions(+), 67 deletions(-)

Index: linux-2.6/fs/ecryptfs/inode.c
===================================================================
--- linux-2.6.orig/fs/ecryptfs/inode.c 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/fs/ecryptfs/inode.c 2008-07-23 00:10:22.000000000 +0200
@@ -61,23 +61,19 @@ static void unlock_dir(struct dentry *di
* Returns zero on success; non-zero on error condition
*/
static int
-ecryptfs_create_underlying_file(struct inode *lower_dir_inode,
+ecryptfs_create_underlying_file(struct dentry *lower_dir_dentry,
struct dentry *dentry, int mode,
struct nameidata *nd)
{
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
- struct vfsmount *lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
- struct dentry *dentry_save;
- struct vfsmount *vfsmount_save;
+ struct path save;
int rc;

- dentry_save = nd->path.dentry;
- vfsmount_save = nd->path.mnt;
- nd->path.dentry = lower_dentry;
- nd->path.mnt = lower_mnt;
- rc = vfs_create(lower_dir_inode, lower_dentry, mode, nd);
- nd->path.dentry = dentry_save;
- nd->path.mnt = vfsmount_save;
+ save = nd->path;
+ nd->path.mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+ nd->path.dentry = lower_dir_dentry;
+ rc = path_create(&nd->path, lower_dentry, mode, nd);
+ nd->path = save;
return rc;
}

@@ -111,7 +107,7 @@ ecryptfs_do_create(struct inode *directo
rc = PTR_ERR(lower_dir_dentry);
goto out;
}
- rc = ecryptfs_create_underlying_file(lower_dir_dentry->d_inode,
+ rc = ecryptfs_create_underlying_file(lower_dir_dentry,
ecryptfs_dentry, mode, nd);
if (rc) {
printk(KERN_ERR "%s: Failure to create dentry in lower fs; "
@@ -528,20 +524,21 @@ ecryptfs_mknod(struct inode *dir, struct
{
int rc;
struct dentry *lower_dentry;
- struct dentry *lower_dir_dentry;
+ struct path lower_dir;

lower_dentry = ecryptfs_dentry_to_lower(dentry);
- lower_dir_dentry = lock_parent(lower_dentry);
- rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev);
+ lower_dir.mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+ lower_dir.dentry = lock_parent(lower_dentry);
+ rc = path_mknod(&lower_dir, lower_dentry, mode, dev);
if (rc || !lower_dentry->d_inode)
goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
if (rc)
goto out;
- fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
- fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir.dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_dir.dentry->d_inode);
out:
- unlock_dir(lower_dir_dentry);
+ unlock_dir(lower_dir.dentry);
if (!dentry->d_inode)
d_drop(dentry);
return rc;
Index: linux-2.6/fs/namei.c
===================================================================
--- linux-2.6.orig/fs/namei.c 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/fs/namei.c 2008-07-23 00:10:22.000000000 +0200
@@ -1496,7 +1496,7 @@ void unlock_rename(struct dentry *p1, st
}
}

-int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
+static int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
struct nameidata *nd)
{
int error = may_create(dir, dentry, nd);
@@ -1518,6 +1518,20 @@ int vfs_create(struct inode *dir, struct
return error;
}

+int path_create(struct path *dir_path, struct dentry *dentry, int mode,
+ struct nameidata *nd)
+{
+ int error = mnt_want_write(dir_path->mnt);
+
+ if (!error) {
+ error = vfs_create(dir_path->dentry->d_inode, dentry, mode, nd);
+ mnt_drop_write(dir_path->mnt);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(path_create);
+
int may_open(struct nameidata *nd, int acc_mode, int flag)
{
struct dentry *dentry = nd->path.dentry;
@@ -1941,7 +1955,7 @@ fail:
}
EXPORT_SYMBOL_GPL(lookup_create);

-int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
+static int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
{
int error = may_create(dir, dentry, NULL);

@@ -1969,22 +1983,19 @@ int vfs_mknod(struct inode *dir, struct
return error;
}

-static int may_mknod(mode_t mode)
+int path_mknod(struct path *dir_path, struct dentry *dentry, int mode,
+ dev_t dev)
{
- switch (mode & S_IFMT) {
- case S_IFREG:
- case S_IFCHR:
- case S_IFBLK:
- case S_IFIFO:
- case S_IFSOCK:
- case 0: /* zero mode translates to S_IFREG */
- return 0;
- case S_IFDIR:
- return -EPERM;
- default:
- return -EINVAL;
+ int error = mnt_want_write(dir_path->mnt);
+
+ if (!error) {
+ error = vfs_mknod(dir_path->dentry->d_inode, dentry, mode, dev);
+ mnt_drop_write(dir_path->mnt);
}
+
+ return error;
}
+EXPORT_SYMBOL(path_mknod);

asmlinkage long sys_mknodat(int dfd, const char __user *filename, int mode,
unsigned dev)
@@ -2010,26 +2021,22 @@ asmlinkage long sys_mknodat(int dfd, con
}
if (!IS_POSIXACL(nd.path.dentry->d_inode))
mode &= ~current->fs->umask;
- error = may_mknod(mode);
- if (error)
- goto out_dput;
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto out_dput;
switch (mode & S_IFMT) {
- case 0: case S_IFREG:
- error = vfs_create(nd.path.dentry->d_inode,dentry,mode,&nd);
- break;
- case S_IFCHR: case S_IFBLK:
- error = vfs_mknod(nd.path.dentry->d_inode,dentry,mode,
- new_decode_dev(dev));
- break;
- case S_IFIFO: case S_IFSOCK:
- error = vfs_mknod(nd.path.dentry->d_inode,dentry,mode,0);
- break;
+ case 0: case S_IFREG:
+ error = path_create(&nd.path, dentry, mode, &nd);
+ break;
+ case S_IFCHR: case S_IFBLK:
+ error = path_mknod(&nd.path, dentry, mode, new_decode_dev(dev));
+ break;
+ case S_IFIFO: case S_IFSOCK:
+ error = path_mknod(&nd.path, dentry, mode, 0);
+ break;
+ case S_IFDIR:
+ error = -EPERM;
+ break;
+ default:
+ error = -EINVAL;
}
- mnt_drop_write(nd.path.mnt);
-out_dput:
dput(dentry);
out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
@@ -2897,11 +2904,9 @@ EXPORT_SYMBOL(inode_permission);
EXPORT_SYMBOL(vfs_permission);
EXPORT_SYMBOL(file_permission);
EXPORT_SYMBOL(unlock_rename);
-EXPORT_SYMBOL(vfs_create);
EXPORT_SYMBOL(vfs_follow_link);
EXPORT_SYMBOL(vfs_link);
EXPORT_SYMBOL(vfs_mkdir);
-EXPORT_SYMBOL(vfs_mknod);
EXPORT_SYMBOL(generic_permission);
EXPORT_SYMBOL(vfs_readlink);
EXPORT_SYMBOL(vfs_rename);
Index: linux-2.6/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.orig/fs/nfsd/vfs.c 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/fs/nfsd/vfs.c 2008-07-23 00:10:22.000000000 +0200
@@ -130,6 +130,12 @@ out:
return err;
}

+static void fh_to_path(struct svc_fh *fhp, struct path *path)
+{
+ path->dentry = fhp->fh_dentry;
+ path->mnt = fhp->fh_export->ex_path.mnt;
+}
+
__be32
nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
const char *name, unsigned int len,
@@ -1186,6 +1192,7 @@ nfsd_create(struct svc_rqst *rqstp, stru
char *fname, int flen, struct iattr *iap,
int type, dev_t rdev, struct svc_fh *resfhp)
{
+ struct path dir_path;
struct dentry *dentry, *dchild = NULL;
struct inode *dirp;
__be32 err;
@@ -1261,13 +1268,11 @@ nfsd_create(struct svc_rqst *rqstp, stru
if (host_err)
goto out_nfserr;

- /*
- * Get the dir op function pointer.
- */
+ fh_to_path(fhp, &dir_path);
err = 0;
switch (type) {
case S_IFREG:
- host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
+ host_err = path_create(&dir_path, dchild, iap->ia_mode, NULL);
break;
case S_IFDIR:
host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
@@ -1276,7 +1281,7 @@ nfsd_create(struct svc_rqst *rqstp, stru
case S_IFBLK:
case S_IFIFO:
case S_IFSOCK:
- host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
+ host_err = path_mknod(&dir_path, dchild, iap->ia_mode, rdev);
break;
}
if (host_err < 0) {
@@ -1318,6 +1323,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, s
struct svc_fh *resfhp, int createmode, u32 *verifier,
int *truncp, int *created)
{
+ struct path dir_path;
struct dentry *dentry, *dchild = NULL;
struct inode *dirp;
__be32 err;
@@ -1408,7 +1414,8 @@ nfsd_create_v3(struct svc_rqst *rqstp, s
goto out;
}

- host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
+ fh_to_path(fhp, &dir_path);
+ host_err = path_create(&dir_path, dchild, iap->ia_mode, NULL);
if (host_err < 0) {
mnt_drop_write(fhp->fh_export->ex_path.mnt);
goto out_nfserr;
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2008-07-23 00:10:22.000000000 +0200
@@ -1126,9 +1126,9 @@ extern void unlock_super(struct super_bl
* VFS helper functions..
*/
extern int vfs_permission(struct nameidata *, int);
-extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
+extern int path_create(struct path *, struct dentry *, int, struct nameidata *);
extern int vfs_mkdir(struct inode *, struct dentry *, int);
-extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
+extern int path_mknod(struct path *, struct dentry *, int, dev_t);
extern int vfs_symlink(struct inode *, struct dentry *, const char *);
extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
extern int vfs_rmdir(struct inode *, struct dentry *);
Index: linux-2.6/ipc/mqueue.c
===================================================================
--- linux-2.6.orig/ipc/mqueue.c 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/ipc/mqueue.c 2008-07-23 00:10:22.000000000 +0200
@@ -599,6 +599,7 @@ static struct file *do_create(struct den
{
struct mq_attr attr;
struct file *result;
+ struct path dir_path;
int ret;

if (u_attr) {
@@ -616,7 +617,10 @@ static struct file *do_create(struct den
ret = mnt_want_write(mqueue_mnt);
if (ret)
goto out;
- ret = vfs_create(dir->d_inode, dentry, mode, NULL);
+
+ dir_path.mnt = mqueue_mnt;
+ dir_path.dentry = dir;
+ ret = path_create(&dir_path, dentry, mode, NULL);
dentry->d_fsdata = NULL;
if (ret)
goto out_drop_write;
Index: linux-2.6/net/unix/af_unix.c
===================================================================
--- linux-2.6.orig/net/unix/af_unix.c 2008-07-23 00:10:13.000000000 +0200
+++ linux-2.6/net/unix/af_unix.c 2008-07-23 00:10:22.000000000 +0200
@@ -824,11 +824,7 @@ static int unix_bind(struct socket *sock
*/
mode = S_IFSOCK |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask);
- err = mnt_want_write(nd.path.mnt);
- if (err)
- goto out_mknod_dput;
- err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
- mnt_drop_write(nd.path.mnt);
+ err = path_mknod(&nd.path, dentry, mode, 0);
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);

--
--
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/