Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6305c43 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] sanitize ->permission() prototype 



* kill nameidata * argument; map the 3 bits in ->flags anybody cares
  about to new MAY_... ones and pass with the mask.
* kill redundant gfs2_iop_permission()
* sanitize ecryptfs_permission()
* fix remaining places where ->permission() instances might barf on new
  MAY_... found in mask.

The obvious next target in that direction is permission(9)

folded fix for nfs_permission() breakage from Miklos Szeredi <mszeredi@suse.cz>

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1bd5191d

fs/afs/internal.h

+1 −3
Original line number Diff line number Diff line
@@ -469,8 +469,6 @@ extern bool afs_cm_incoming_call(struct afs_call *); 
extern const struct inode_operations afs_dir_inode_operations;

extern const struct file_operations afs_dir_file_operations;



extern int afs_permission(struct inode *, int, struct nameidata *);



/*

 * file.c

 */
@@ -605,7 +603,7 @@ extern void afs_clear_permits(struct afs_vnode *); 
extern void afs_cache_permit(struct afs_vnode *, struct key *, long);

extern void afs_zap_permits(struct rcu_head *);

extern struct key *afs_request_key(struct afs_cell *);

extern int afs_permission(struct inode *, int, struct nameidata *);

extern int afs_permission(struct inode *, int);



/*

 * server.c

fs/afs/security.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int afs_check_permit(struct afs_vnode *vnode, struct key *key, 
 * - AFS ACLs are attached to directories only, and a file is controlled by its

 *   parent directory's ACL

 */

int afs_permission(struct inode *inode, int mask, struct nameidata *nd)

int afs_permission(struct inode *inode, int mask)

{

	struct afs_vnode *vnode = AFS_FS_I(inode);

	afs_access_t uninitialized_var(access);

fs/bad_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ static int bad_inode_readlink(struct dentry *dentry, char __user *buffer, 
	return -EIO;

}



static int bad_inode_permission(struct inode *inode, int mask,

			struct nameidata *nd)

static int bad_inode_permission(struct inode *inode, int mask)

{

	return -EIO;

}

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	return 0;

}



static int cifs_permission(struct inode *inode, int mask, struct nameidata *nd)

static int cifs_permission(struct inode *inode, int mask)

{

	struct cifs_sb_info *cifs_sb;

fs/coda/dir.c

+3 −1
Original line number Diff line number Diff line
@@ -137,10 +137,12 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struc 
}





int coda_permission(struct inode *inode, int mask, struct nameidata *nd)

int coda_permission(struct inode *inode, int mask)

{

        int error = 0;



	mask &= MAY_READ | MAY_WRITE | MAY_EXEC;

 

	if (!mask)

		return 0;