aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-26 04:25:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:55:13 -0500
commit910f4ecef3f67714ebff69d0bc34313e48afaed2 (patch)
tree348fe3b5d8789a4c019a700da5501a4756f988de
parent49f0a0767211d3076974e59a26f36b567cbe8621 (diff)
switch security_path_chmod() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/security.h6
-rw-r--r--security/apparmor/lsm.c2
-rw-r--r--security/capability.c2
-rw-r--r--security/security.c2
-rw-r--r--security/tomoyo/tomoyo.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 0e5aeb86dfc4..f2c1fd7978a5 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1436,7 +1436,7 @@ struct security_operations {
1436 int (*path_rename) (struct path *old_dir, struct dentry *old_dentry, 1436 int (*path_rename) (struct path *old_dir, struct dentry *old_dentry,
1437 struct path *new_dir, struct dentry *new_dentry); 1437 struct path *new_dir, struct dentry *new_dentry);
1438 int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt, 1438 int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt,
1439 mode_t mode); 1439 umode_t mode);
1440 int (*path_chown) (struct path *path, uid_t uid, gid_t gid); 1440 int (*path_chown) (struct path *path, uid_t uid, gid_t gid);
1441 int (*path_chroot) (struct path *path); 1441 int (*path_chroot) (struct path *path);
1442#endif 1442#endif
@@ -2867,7 +2867,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
2867int security_path_rename(struct path *old_dir, struct dentry *old_dentry, 2867int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
2868 struct path *new_dir, struct dentry *new_dentry); 2868 struct path *new_dir, struct dentry *new_dentry);
2869int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 2869int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
2870 mode_t mode); 2870 umode_t mode);
2871int security_path_chown(struct path *path, uid_t uid, gid_t gid); 2871int security_path_chown(struct path *path, uid_t uid, gid_t gid);
2872int security_path_chroot(struct path *path); 2872int security_path_chroot(struct path *path);
2873#else /* CONFIG_SECURITY_PATH */ 2873#else /* CONFIG_SECURITY_PATH */
@@ -2921,7 +2921,7 @@ static inline int security_path_rename(struct path *old_dir,
2921 2921
2922static inline int security_path_chmod(struct dentry *dentry, 2922static inline int security_path_chmod(struct dentry *dentry,
2923 struct vfsmount *mnt, 2923 struct vfsmount *mnt,
2924 mode_t mode) 2924 umode_t mode)
2925{ 2925{
2926 return 0; 2926 return 0;
2927} 2927}
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 37832026e58a..afbe49822bed 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -345,7 +345,7 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
345} 345}
346 346
347static int apparmor_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 347static int apparmor_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
348 mode_t mode) 348 umode_t mode)
349{ 349{
350 if (!mediated_filesystem(dentry->d_inode)) 350 if (!mediated_filesystem(dentry->d_inode))
351 return 0; 351 return 0;
diff --git a/security/capability.c b/security/capability.c
index 9def035cd572..4f24bee49f26 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -280,7 +280,7 @@ static int cap_path_truncate(struct path *path)
280} 280}
281 281
282static int cap_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 282static int cap_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
283 mode_t mode) 283 umode_t mode)
284{ 284{
285 return 0; 285 return 0;
286} 286}
diff --git a/security/security.c b/security/security.c
index 8cc0f0caa640..3635a13cd4ab 100644
--- a/security/security.c
+++ b/security/security.c
@@ -455,7 +455,7 @@ int security_path_truncate(struct path *path)
455} 455}
456 456
457int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 457int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
458 mode_t mode) 458 umode_t mode)
459{ 459{
460 if (unlikely(IS_PRIVATE(dentry->d_inode))) 460 if (unlikely(IS_PRIVATE(dentry->d_inode)))
461 return 0; 461 return 0;
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 4b327b691745..a4b840ea0078 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -360,7 +360,7 @@ static int tomoyo_file_ioctl(struct file *file, unsigned int cmd,
360 * Returns 0 on success, negative value otherwise. 360 * Returns 0 on success, negative value otherwise.
361 */ 361 */
362static int tomoyo_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 362static int tomoyo_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
363 mode_t mode) 363 umode_t mode)
364{ 364{
365 struct path path = { mnt, dentry }; 365 struct path path = { mnt, dentry };
366 return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path, 366 return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path,