diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-21 14:58:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:19 -0500 |
commit | 04fc66e789a896e684bfdca30208e57eb832dd96 (patch) | |
tree | 37c26bff07e48c8c25d147850b7906d0d1c79a81 | |
parent | 4572befe248fd0d94aedc98775e3f0ddc8a26651 (diff) |
switch ->path_mknod() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | include/linux/security.h | 6 | ||||
-rw-r--r-- | net/unix/af_unix.c | 2 | ||||
-rw-r--r-- | security/apparmor/lsm.c | 2 | ||||
-rw-r--r-- | security/capability.c | 2 | ||||
-rw-r--r-- | security/security.c | 2 | ||||
-rw-r--r-- | security/tomoyo/tomoyo.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 24cd7cf4856..535721cc374 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1426,7 +1426,7 @@ struct security_operations { | |||
1426 | int (*path_unlink) (struct path *dir, struct dentry *dentry); | 1426 | int (*path_unlink) (struct path *dir, struct dentry *dentry); |
1427 | int (*path_mkdir) (struct path *dir, struct dentry *dentry, umode_t mode); | 1427 | int (*path_mkdir) (struct path *dir, struct dentry *dentry, umode_t mode); |
1428 | int (*path_rmdir) (struct path *dir, struct dentry *dentry); | 1428 | int (*path_rmdir) (struct path *dir, struct dentry *dentry); |
1429 | int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode, | 1429 | int (*path_mknod) (struct path *dir, struct dentry *dentry, umode_t mode, |
1430 | unsigned int dev); | 1430 | unsigned int dev); |
1431 | int (*path_truncate) (struct path *path); | 1431 | int (*path_truncate) (struct path *path); |
1432 | int (*path_symlink) (struct path *dir, struct dentry *dentry, | 1432 | 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 | |||
2857 | int security_path_unlink(struct path *dir, struct dentry *dentry); | 2857 | int security_path_unlink(struct path *dir, struct dentry *dentry); |
2858 | int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode); | 2858 | int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode); |
2859 | int security_path_rmdir(struct path *dir, struct dentry *dentry); | 2859 | int security_path_rmdir(struct path *dir, struct dentry *dentry); |
2860 | int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, | 2860 | int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode, |
2861 | unsigned int dev); | 2861 | unsigned int dev); |
2862 | int security_path_truncate(struct path *path); | 2862 | int security_path_truncate(struct path *path); |
2863 | int security_path_symlink(struct path *dir, struct dentry *dentry, | 2863 | 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) | |||
2888 | } | 2888 | } |
2889 | 2889 | ||
2890 | static inline int security_path_mknod(struct path *dir, struct dentry *dentry, | 2890 | static inline int security_path_mknod(struct path *dir, struct dentry *dentry, |
2891 | int mode, unsigned int dev) | 2891 | umode_t mode, unsigned int dev) |
2892 | { | 2892 | { |
2893 | return 0; | 2893 | return 0; |
2894 | } | 2894 | } |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index b595a3d8679..412a99f4a3f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -847,7 +847,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
847 | atomic_set(&addr->refcnt, 1); | 847 | atomic_set(&addr->refcnt, 1); |
848 | 848 | ||
849 | if (sun_path[0]) { | 849 | if (sun_path[0]) { |
850 | unsigned int mode; | 850 | umode_t mode; |
851 | err = 0; | 851 | err = 0; |
852 | /* | 852 | /* |
853 | * Get the parent directory, calculate the hash for last | 853 | * Get the parent directory, calculate the hash for last |
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 3271bd38d86..c0a399ec1df 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c | |||
@@ -274,7 +274,7 @@ static int apparmor_path_rmdir(struct path *dir, struct dentry *dentry) | |||
274 | } | 274 | } |
275 | 275 | ||
276 | static int apparmor_path_mknod(struct path *dir, struct dentry *dentry, | 276 | static int apparmor_path_mknod(struct path *dir, struct dentry *dentry, |
277 | int mode, unsigned int dev) | 277 | umode_t mode, unsigned int dev) |
278 | { | 278 | { |
279 | return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode); | 279 | return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode); |
280 | } | 280 | } |
diff --git a/security/capability.c b/security/capability.c index 2e1fe45d148..156816d451b 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -235,7 +235,7 @@ static void cap_inode_getsecid(const struct inode *inode, u32 *secid) | |||
235 | } | 235 | } |
236 | 236 | ||
237 | #ifdef CONFIG_SECURITY_PATH | 237 | #ifdef CONFIG_SECURITY_PATH |
238 | static int cap_path_mknod(struct path *dir, struct dentry *dentry, int mode, | 238 | static int cap_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode, |
239 | unsigned int dev) | 239 | unsigned int dev) |
240 | { | 240 | { |
241 | return 0; | 241 | return 0; |
diff --git a/security/security.c b/security/security.c index e9724e058b4..151152de1a0 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -388,7 +388,7 @@ int security_old_inode_init_security(struct inode *inode, struct inode *dir, | |||
388 | EXPORT_SYMBOL(security_old_inode_init_security); | 388 | EXPORT_SYMBOL(security_old_inode_init_security); |
389 | 389 | ||
390 | #ifdef CONFIG_SECURITY_PATH | 390 | #ifdef CONFIG_SECURITY_PATH |
391 | int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, | 391 | int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode, |
392 | unsigned int dev) | 392 | unsigned int dev) |
393 | { | 393 | { |
394 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) | 394 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 95e4a7db8b8..75c956a51e7 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c | |||
@@ -234,7 +234,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry, | |||
234 | * Returns 0 on success, negative value otherwise. | 234 | * Returns 0 on success, negative value otherwise. |
235 | */ | 235 | */ |
236 | static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry, | 236 | static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry, |
237 | int mode, unsigned int dev) | 237 | umode_t mode, unsigned int dev) |
238 | { | 238 | { |
239 | struct path path = { parent->mnt, dentry }; | 239 | struct path path = { parent->mnt, dentry }; |
240 | int type = TOMOYO_TYPE_CREATE; | 240 | int type = TOMOYO_TYPE_CREATE; |