UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

->permission() sanitizing: don't pass flags to ->check_acl() 

not used in the instances anymore.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-06-20 19:12:17 -04:00
parent 9c2c703929
commit 7e40145eb1
28 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/Locking
View File

@ -52,7 +52,7 @@ ata *);
void (*put_link) (struct dentry *, struct nameidata *, void *);
void (*truncate) (struct inode *);
int (*permission) (struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int);
int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);

2
Documentation/filesystems/vfs.txt
View File

@ -334,7 +334,7 @@ struct inode_operations {
void (*put_link) (struct dentry *, struct nameidata *, void *);
void (*truncate) (struct inode *);
int (*permission) (struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int);
int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);

2
fs/9p/acl.c
View File

@ -96,7 +96,7 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type)
return acl;
}
int v9fs_check_acl(struct inode *inode, int mask, unsigned int flags)
int v9fs_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;
struct v9fs_session_info *v9ses;

2
fs/9p/acl.h
View File

@ -16,7 +16,7 @@
#ifdef CONFIG_9P_FS_POSIX_ACL
extern int v9fs_get_acl(struct inode *, struct p9_fid *);
extern int v9fs_check_acl(struct inode *inode, int mask, unsigned int flags);
extern int v9fs_check_acl(struct inode *inode, int mask);
extern int v9fs_acl_chmod(struct dentry *);
extern int v9fs_set_create_acl(struct dentry *,
struct posix_acl *, struct posix_acl *);

2
fs/btrfs/acl.c
View File

@ -195,7 +195,7 @@ out:
return ret;
}
int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
int btrfs_check_acl(struct inode *inode, int mask)
{
int error = -EAGAIN;

2
fs/btrfs/ctree.h
View File

@ -2642,7 +2642,7 @@ do { \
/* acl.c */
#ifdef CONFIG_BTRFS_FS_POSIX_ACL
int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags);
int btrfs_check_acl(struct inode *inode, int mask);
#else
#define btrfs_check_acl NULL
#endif

2
fs/ext2/acl.c
View File

@ -232,7 +232,7 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
}
int
ext2_check_acl(struct inode *inode, int mask, unsigned int flags)
ext2_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;

2
fs/ext2/acl.h
View File

@ -54,7 +54,7 @@ static inline int ext2_acl_count(size_t size)
#ifdef CONFIG_EXT2_FS_POSIX_ACL
/* acl.c */
extern int ext2_check_acl (struct inode *, int, unsigned int);
extern int ext2_check_acl (struct inode *, int);
extern int ext2_acl_chmod (struct inode *);
extern int ext2_init_acl (struct inode *, struct inode *);

2
fs/ext3/acl.c
View File

@ -240,7 +240,7 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
}
int
ext3_check_acl(struct inode *inode, int mask, unsigned int flags)
ext3_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;

2
fs/ext3/acl.h
View File

@ -54,7 +54,7 @@ static inline int ext3_acl_count(size_t size)
#ifdef CONFIG_EXT3_FS_POSIX_ACL
/* acl.c */
extern int ext3_check_acl (struct inode *, int, unsigned int);
extern int ext3_check_acl (struct inode *, int);
extern int ext3_acl_chmod (struct inode *);
extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);

2
fs/ext4/acl.c
View File

@ -238,7 +238,7 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,
}
int
ext4_check_acl(struct inode *inode, int mask, unsigned int flags)
ext4_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;

2
fs/ext4/acl.h
View File

@ -54,7 +54,7 @@ static inline int ext4_acl_count(size_t size)
#ifdef CONFIG_EXT4_FS_POSIX_ACL
/* acl.c */
extern int ext4_check_acl(struct inode *, int, unsigned int);
extern int ext4_check_acl(struct inode *, int);
extern int ext4_acl_chmod(struct inode *);
extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);

2
fs/generic_acl.c
View File

@ -190,7 +190,7 @@ generic_acl_chmod(struct inode *inode)
}
int
generic_check_acl(struct inode *inode, int mask, unsigned int flags)
generic_check_acl(struct inode *inode, int mask)
{
if (mask & MAY_NOT_BLOCK) {
if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))

2
fs/gfs2/acl.c
View File

@ -75,7 +75,7 @@ static struct posix_acl *gfs2_acl_get(struct gfs2_inode *ip, int type)
* Returns: errno
*/
int gfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
int gfs2_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;
int error;

2
fs/gfs2/acl.h
View File

@ -16,7 +16,7 @@
#define GFS2_POSIX_ACL_DEFAULT "posix_acl_default"
#define GFS2_ACL_MAX_ENTRIES 25
extern int gfs2_check_acl(struct inode *inode, int mask, unsigned int);
extern int gfs2_check_acl(struct inode *inode, int mask);
extern int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode);
extern int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);
extern const struct xattr_handler gfs2_xattr_system_handler;

2
fs/jffs2/acl.c
View File

@ -259,7 +259,7 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
return rc;
}
int jffs2_check_acl(struct inode *inode, int mask, unsigned int flags)
int jffs2_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;
int rc;

2
fs/jffs2/acl.h
View File

@ -26,7 +26,7 @@ struct jffs2_acl_header {
#ifdef CONFIG_JFFS2_FS_POSIX_ACL
extern int jffs2_check_acl(struct inode *, int, unsigned int);
extern int jffs2_check_acl(struct inode *, int);
extern int jffs2_acl_chmod(struct inode *);
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
extern int jffs2_init_acl_post(struct inode *);

2
fs/jfs/acl.c
View File

@ -114,7 +114,7 @@ out:
return rc;
}
int jfs_check_acl(struct inode *inode, int mask, unsigned int flags)
int jfs_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;

2
fs/jfs/jfs_acl.h
View File

@ -20,7 +20,7 @@
#ifdef CONFIG_JFS_POSIX_ACL
int jfs_check_acl(struct inode *, int, unsigned int flags);
int jfs_check_acl(struct inode *, int);
int jfs_init_acl(tid_t, struct inode *, struct inode *);
int jfs_acl_chmod(struct inode *inode);

10
fs/namei.c
View File

@ -176,9 +176,9 @@ EXPORT_SYMBOL(putname);
/*
* This does basic POSIX ACL permission checking
*/
static int acl_permission_check(struct inode *inode, int mask, unsigned int flags)
static int acl_permission_check(struct inode *inode, int mask)
{
int (*check_acl)(struct inode *inode, int mask, unsigned int flags);
int (*check_acl)(struct inode *inode, int mask);
unsigned int mode = inode->i_mode;
mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
@ -191,7 +191,7 @@ static int acl_permission_check(struct inode *inode, int mask, unsigned int flag
else {
check_acl = inode->i_op->check_acl;
if (IS_POSIXACL(inode) && (mode & S_IRWXG) && check_acl) {
int error = check_acl(inode, mask, flags);
int error = check_acl(inode, mask);
if (error != -EAGAIN)
return error;
}
@ -231,7 +231,7 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags)
/*
* Do the basic POSIX ACL permission checks.
*/
ret = acl_permission_check(inode, mask, flags);
ret = acl_permission_check(inode, mask);
if (ret != -EACCES)
return ret;
@ -327,7 +327,7 @@ static inline int exec_permission(struct inode *inode, unsigned int flags)
if (likely(!ret))
goto ok;
} else {
ret = acl_permission_check(inode, mask, flags);
ret = acl_permission_check(inode, mask);
if (likely(!ret))
goto ok;
if (ret != -EACCES)

2
fs/ocfs2/acl.c
View File

@ -290,7 +290,7 @@ static int ocfs2_set_acl(handle_t *handle,
return ret;
}
int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
int ocfs2_check_acl(struct inode *inode, int mask)
{
struct ocfs2_super *osb;
struct buffer_head *di_bh = NULL;

2
fs/ocfs2/acl.h
View File

@ -26,7 +26,7 @@ struct ocfs2_acl_entry {
__le32 e_id;
};
extern int ocfs2_check_acl(struct inode *, int, unsigned int);
extern int ocfs2_check_acl(struct inode *, int);
extern int ocfs2_acl_chmod(struct inode *);
extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
struct buffer_head *, struct buffer_head *,

2
fs/reiserfs/xattr.c
View File

@ -868,7 +868,7 @@ out:
return err;
}
int reiserfs_check_acl(struct inode *inode, int mask, unsigned int flags)
int reiserfs_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl;
int error = -EAGAIN; /* do regular unix permission checks by default */

2
fs/xfs/linux-2.6/xfs_acl.c
View File

@ -219,7 +219,7 @@ xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
}
int
xfs_check_acl(struct inode *inode, int mask, unsigned int flags)
xfs_check_acl(struct inode *inode, int mask)
{
struct xfs_inode *ip;
struct posix_acl *acl;

2
fs/xfs/xfs_acl.h
View File

@ -42,7 +42,7 @@ struct xfs_acl {
#define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1)
#ifdef CONFIG_XFS_POSIX_ACL
extern int xfs_check_acl(struct inode *inode, int mask, unsigned int flags);
extern int xfs_check_acl(struct inode *inode, int mask);
extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);
extern int xfs_inherit_acl(struct inode *inode, struct posix_acl *default_acl);
extern int xfs_acl_chmod(struct inode *inode);

2
include/linux/fs.h
View File

@ -1579,7 +1579,7 @@ struct inode_operations {
struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
void * (*follow_link) (struct dentry *, struct nameidata *);
int (*permission) (struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int, unsigned int);
int (*check_acl)(struct inode *, int);
int (*readlink) (struct dentry *, char __user *,int);
void (*put_link) (struct dentry *, struct nameidata *, void *);

2
include/linux/generic_acl.h
View File

@ -10,6 +10,6 @@ extern const struct xattr_handler generic_acl_default_handler;
int generic_acl_init(struct inode *, struct inode *);
int generic_acl_chmod(struct inode *);
int generic_check_acl(struct inode *inode, int mask, unsigned int flags);
int generic_check_acl(struct inode *inode, int mask);
#endif /* LINUX_GENERIC_ACL_H */

2
include/linux/reiserfs_xattr.h
View File

@ -45,7 +45,7 @@ int reiserfs_permission(struct inode *inode, int mask, unsigned int flags);
#ifdef CONFIG_REISERFS_FS_XATTR
#define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
int reiserfs_check_acl(struct inode *inode, int mask, unsigned int flags);
int reiserfs_check_acl(struct inode *inode, int mask);
ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
void *buffer, size_t size);
int reiserfs_setxattr(struct dentry *dentry, const char *name,