From: Dave Hansen <haveblue@us.ibm.com>
To: linux-fsdevel@vger.kernel.org
Cc: herbert@13thfloor.at, viro@ftp.linux.org.uk, hch@infradead.org,
trond.myklebust@fys.uio.no, Dave Hansen <haveblue@us.ibm.com>
Subject: [RFC][PATCH 24/27] elevate mount count for extended attributes
Date: Wed, 07 Jun 2006 17:10:37 -0700 [thread overview]
Message-ID: <20060608001037.26C3EB3E@localhost.localdomain> (raw)
In-Reply-To: <20060608001013.0D041507@localhost.localdomain>
This basically audits the callers of xattr_permission(), which
calls permission() itself.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
fs/namei.c | 0
lxc-dave/fs/nfsd/nfs4proc.c | 7 ++++++-
lxc-dave/fs/xattr.c | 14 ++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff -puN fs/xattr.c~xattr fs/xattr.c
--- lxc/fs/xattr.c~xattr 2006-06-07 16:53:27.000000000 -0700
+++ lxc-dave/fs/xattr.c 2006-06-07 16:53:27.000000000 -0700
@@ -12,6 +12,7 @@
#include <linux/smp_lock.h>
#include <linux/file.h>
#include <linux/xattr.h>
+#include <linux/mount.h>
#include <linux/namei.h>
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -210,7 +211,11 @@ sys_setxattr(char __user *path, char __u
error = user_path_walk(path, &nd);
if (error)
return error;
+ error = mnt_want_write(nd.mnt);
+ if (error)
+ return error;
error = setxattr(nd.dentry, name, value, size, flags);
+ mnt_drop_write(nd.mnt);
path_release(&nd);
return error;
}
@@ -225,7 +230,11 @@ sys_lsetxattr(char __user *path, char __
error = user_path_walk_link(path, &nd);
if (error)
return error;
+ error = mnt_want_write(nd.mnt);
+ if (error)
+ return error;
error = setxattr(nd.dentry, name, value, size, flags);
+ mnt_drop_write(nd.mnt);
path_release(&nd);
return error;
}
@@ -241,9 +250,14 @@ sys_fsetxattr(int fd, char __user *name,
f = fget(fd);
if (!f)
return error;
+ error = mnt_want_write(f->f_vfsmnt);
+ if (error)
+ goto out_fput;
dentry = f->f_dentry;
audit_inode(NULL, dentry->d_inode, 0);
error = setxattr(dentry, name, value, size, flags);
+ mnt_drop_write(f->f_vfsmnt);
+out_fput:
fput(f);
return error;
}
diff -puN fs/nfsd/vfs.c~xattr fs/nfsd/vfs.c
diff -puN fs/nfsd/nfs4proc.c~xattr fs/nfsd/nfs4proc.c
--- lxc/fs/nfsd/nfs4proc.c~xattr 2006-06-07 16:53:27.000000000 -0700
+++ lxc-dave/fs/nfsd/nfs4proc.c 2006-06-07 16:53:27.000000000 -0700
@@ -604,13 +604,18 @@ nfsd4_setattr(struct svc_rqst *rqstp, st
return status;
}
}
+ status = mnt_want_write(current_fh->fh_export->ex_mnt);
+ if (status)
+ return status;
status = nfs_ok;
if (setattr->sa_acl != NULL)
status = nfsd4_set_nfs4_acl(rqstp, current_fh, setattr->sa_acl);
if (status)
- return status;
+ goto out;
status = nfsd_setattr(rqstp, current_fh, &setattr->sa_iattr,
0, (time_t)0);
+out:
+ mnt_drop_write(current_fh->fh_export->ex_mnt);
return status;
}
diff -puN fs/namei.c~xattr fs/namei.c
_
next prev parent reply other threads:[~2006-06-08 0:10 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-08 0:10 [RFC][PATCH 00/27] Read-only bind mounts Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 01/27] Add vfsmount writer count Dave Hansen
2006-06-08 10:33 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 02/27] vfs_rmdir: change if() into goto Dave Hansen
2006-06-08 10:37 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 04/27] elevate mnt writers for vfs_unlink() callers Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 03/27] do_rmdir(): elevate write count Dave Hansen
2006-06-08 10:42 ` Herbert Poetzl
2006-06-08 15:04 ` Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 05/27] elevate mnt writers for nfsd caller of vfs_mkdir() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 06/27] elevate write count during entire ncp_ioctl() Dave Hansen
2006-06-08 10:44 ` Herbert Poetzl
2006-06-08 15:07 ` Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 07/27] sys_mkdirat(): collapse if() Dave Hansen
2006-06-08 10:46 ` Herbert Poetzl
2006-06-08 15:10 ` Dave Hansen
2006-06-08 15:54 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 09/27] elevate mnt writers for sys_mkdirat() call of vfs_mkdir() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 08/27] sys_mkdirat(): one more goto Dave Hansen
2006-06-08 10:48 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 10/27] sys_symlinkat() collapse if()s Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 11/27] sys_symlinkat() collapse one more if () Dave Hansen
2006-06-08 10:49 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 13/27] sys_linkat(): elevate write count around vfs_link() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 12/27] sys_symlinkat() elevate write count around vfs_symlink() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 14/27] tricky: elevate write count files are open()ed Dave Hansen
2006-06-08 10:54 ` Herbert Poetzl
2006-06-08 15:12 ` Dave Hansen
2006-06-08 16:07 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 15/27] elevate writer count for do_sys_truncate() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 16/27] elevate write count for do_sys_utime() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 17/27] elevate write count for do_utimes() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 18/27] sys_faccessat(): collapse if() Dave Hansen
2006-06-08 11:05 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 19/27] sys_faccessat() elevate writer count Dave Hansen
2006-06-08 11:03 ` Herbert Poetzl
2006-06-08 15:15 ` Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 20/27] unix_find_other() elevate write count for touch_atime() Dave Hansen
2006-06-08 11:07 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 21/27] mount_is_safe(): add comment Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 22/27] sys_mknodat(): elevate write count for vfs_mknod/create() Dave Hansen
2006-06-08 11:16 ` Herbert Poetzl
2006-06-08 15:23 ` Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 23/27] elevate write count over calls to vfs_rename() Dave Hansen
2006-06-08 11:23 ` Herbert Poetzl
2006-06-08 15:24 ` Dave Hansen
2006-06-12 18:18 ` Al Viro
2006-06-12 18:29 ` Dave Hansen
2006-06-12 19:03 ` Al Viro
2006-06-08 0:10 ` Dave Hansen [this message]
2006-06-08 0:10 ` [RFC][PATCH 25/27] /proc/mounts: prep for flags from sb or mnt Dave Hansen
2006-06-08 11:25 ` Herbert Poetzl
2006-06-08 0:10 ` [RFC][PATCH 27/27] create and pass read-only mnt flag into do_loopback() Dave Hansen
2006-06-08 0:10 ` [RFC][PATCH 26/27] /proc/mounts: treat ro/rw like the rest Dave Hansen
2006-06-08 11:26 ` Herbert Poetzl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060608001037.26C3EB3E@localhost.localdomain \
--to=haveblue@us.ibm.com \
--cc=hch@infradead.org \
--cc=herbert@13thfloor.at \
--cc=linux-fsdevel@vger.kernel.org \
--cc=trond.myklebust@fys.uio.no \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).