diff options
-rw-r--r-- | include/linux/security.h | 6 | ||||
-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 |
5 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index fab659edf11a..24cd7cf48564 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1424,7 +1424,7 @@ struct security_operations { | |||
1424 | 1424 | ||
1425 | #ifdef CONFIG_SECURITY_PATH | 1425 | #ifdef CONFIG_SECURITY_PATH |
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, int 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, int mode, |
1430 | unsigned int dev); | 1430 | unsigned int dev); |
@@ -2855,7 +2855,7 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi | |||
2855 | 2855 | ||
2856 | #ifdef CONFIG_SECURITY_PATH | 2856 | #ifdef CONFIG_SECURITY_PATH |
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, int 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, int mode, |
2861 | unsigned int dev); | 2861 | unsigned int dev); |
@@ -2877,7 +2877,7 @@ static inline int security_path_unlink(struct path *dir, struct dentry *dentry) | |||
2877 | } | 2877 | } |
2878 | 2878 | ||
2879 | static inline int security_path_mkdir(struct path *dir, struct dentry *dentry, | 2879 | static inline int security_path_mkdir(struct path *dir, struct dentry *dentry, |
2880 | int mode) | 2880 | umode_t mode) |
2881 | { | 2881 | { |
2882 | return 0; | 2882 | return 0; |
2883 | } | 2883 | } |
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index afbe49822bed..3271bd38d860 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c | |||
@@ -262,7 +262,7 @@ static int apparmor_path_unlink(struct path *dir, struct dentry *dentry) | |||
262 | } | 262 | } |
263 | 263 | ||
264 | static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry, | 264 | static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry, |
265 | int mode) | 265 | umode_t mode) |
266 | { | 266 | { |
267 | return common_perm_create(OP_MKDIR, dir, dentry, AA_MAY_CREATE, | 267 | return common_perm_create(OP_MKDIR, dir, dentry, AA_MAY_CREATE, |
268 | S_IFDIR); | 268 | S_IFDIR); |
diff --git a/security/capability.c b/security/capability.c index 4f24bee49f26..2e1fe45d1486 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -241,7 +241,7 @@ static int cap_path_mknod(struct path *dir, struct dentry *dentry, int mode, | |||
241 | return 0; | 241 | return 0; |
242 | } | 242 | } |
243 | 243 | ||
244 | static int cap_path_mkdir(struct path *dir, struct dentry *dentry, int mode) | 244 | static int cap_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode) |
245 | { | 245 | { |
246 | return 0; | 246 | return 0; |
247 | } | 247 | } |
diff --git a/security/security.c b/security/security.c index 3635a13cd4ab..e9724e058b43 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -397,7 +397,7 @@ int security_path_mknod(struct path *dir, struct dentry *dentry, int mode, | |||
397 | } | 397 | } |
398 | EXPORT_SYMBOL(security_path_mknod); | 398 | EXPORT_SYMBOL(security_path_mknod); |
399 | 399 | ||
400 | int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) | 400 | int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode) |
401 | { | 401 | { |
402 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) | 402 | if (unlikely(IS_PRIVATE(dir->dentry->d_inode))) |
403 | return 0; | 403 | return 0; |
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index a4b840ea0078..95e4a7db8b86 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c | |||
@@ -186,7 +186,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry) | |||
186 | * Returns 0 on success, negative value otherwise. | 186 | * Returns 0 on success, negative value otherwise. |
187 | */ | 187 | */ |
188 | static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry, | 188 | static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry, |
189 | int mode) | 189 | umode_t mode) |
190 | { | 190 | { |
191 | struct path path = { parent->mnt, dentry }; | 191 | struct path path = { parent->mnt, dentry }; |
192 | return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path, | 192 | return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path, |