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

Commit 4572befe authored by Al Viro's avatar Al Viro
Browse files

switch ->path_mkdir() to umode_t 



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

include/linux/security.h

+3 −3
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ struct security_operations { 


#ifdef CONFIG_SECURITY_PATH

	int (*path_unlink) (struct path *dir, struct dentry *dentry);

	int (*path_mkdir) (struct path *dir, struct dentry *dentry, int mode);

	int (*path_mkdir) (struct path *dir, struct dentry *dentry, umode_t mode);

	int (*path_rmdir) (struct path *dir, struct dentry *dentry);

	int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode,

			   unsigned int dev);
@@ -2855,7 +2855,7 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi 


#ifdef CONFIG_SECURITY_PATH

int security_path_unlink(struct path *dir, struct dentry *dentry);

int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode);

int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode);

int security_path_rmdir(struct path *dir, struct dentry *dentry);

int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,

			unsigned int dev);
@@ -2877,7 +2877,7 @@ static inline int security_path_unlink(struct path *dir, struct dentry *dentry) 
}



static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,

				      int mode)

				      umode_t mode)

{

	return 0;

}

security/apparmor/lsm.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int apparmor_path_unlink(struct path *dir, struct dentry *dentry) 
}



static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry,

			       int mode)

			       umode_t mode)

{

	return common_perm_create(OP_MKDIR, dir, dentry, AA_MAY_CREATE,

				  S_IFDIR);

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int cap_path_mknod(struct path *dir, struct dentry *dentry, int mode, 
	return 0;

}



static int cap_path_mkdir(struct path *dir, struct dentry *dentry, int mode)

static int cap_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode)

{

	return 0;

}

security/security.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, 
}

EXPORT_SYMBOL(security_path_mknod);



int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)

int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode)

{

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

security/tomoyo/tomoyo.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry) 
 * Returns 0 on success, negative value otherwise.

 */

static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,

			     int mode)

			     umode_t mode)

{

	struct path path = { parent->mnt, dentry };

	return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,