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

Commit 04fc66e7 authored by Al Viro's avatar Al Viro
Browse files

switch ->path_mknod() to umode_t 



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

include/linux/security.h

+3 −3
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ struct security_operations { 
	int (*path_unlink) (struct path *dir, struct dentry *dentry);

	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,

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

			   unsigned int dev);

	int (*path_truncate) (struct path *path);

	int (*path_symlink) (struct path *dir, struct dentry *dentry,
@@ -2857,7 +2857,7 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi 
int security_path_unlink(struct path *dir, struct dentry *dentry);

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,

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

			unsigned int dev);

int security_path_truncate(struct path *path);

int security_path_symlink(struct path *dir, struct dentry *dentry,
@@ -2888,7 +2888,7 @@ static inline int security_path_rmdir(struct path *dir, struct dentry *dentry) 
}



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

				      int mode, unsigned int dev)

				      umode_t mode, unsigned int dev)

{

	return 0;

}

net/unix/af_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	atomic_set(&addr->refcnt, 1);



	if (sun_path[0]) {

		unsigned int mode;

		umode_t mode;

		err = 0;

		/*

		 * Get the parent directory, calculate the hash for last

security/apparmor/lsm.c

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



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

			       int mode, unsigned int dev)

			       umode_t mode, unsigned int dev)

{

	return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode);

}

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void cap_inode_getsecid(const struct inode *inode, u32 *secid) 
}



#ifdef CONFIG_SECURITY_PATH

static int cap_path_mknod(struct path *dir, struct dentry *dentry, int mode,

static int cap_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,

			  unsigned int dev)

{

	return 0;

security/security.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ int security_old_inode_init_security(struct inode *inode, struct inode *dir, 
EXPORT_SYMBOL(security_old_inode_init_security);



#ifdef CONFIG_SECURITY_PATH

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

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

			unsigned int dev)

{

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