xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constify security_path_{unlink,rmdir}

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2016-03-25 15:13:39 -04:00
parent d6b49f7ad2
commit 989f74e050
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/lsm_hooks.h
View File

@@ -1360,10 +1360,10 @@ union security_list_options {
#ifdef CONFIG_SECURITY_PATH #ifdef CONFIG_SECURITY_PATH
int (*path_unlink)(struct path *dir, struct dentry *dentry); int (*path_unlink)(const struct path *dir, struct dentry *dentry);
int (*path_mkdir)(struct path *dir, struct dentry *dentry, int (*path_mkdir)(struct path *dir, struct dentry *dentry,
umode_t mode); umode_t mode);
int (*path_rmdir)(struct path *dir, struct dentry *dentry); int (*path_rmdir)(const struct path *dir, struct dentry *dentry);
int (*path_mknod)(struct path *dir, struct dentry *dentry, int (*path_mknod)(struct path *dir, struct dentry *dentry,
umode_t mode, unsigned int dev); umode_t mode, unsigned int dev);
int (*path_truncate)(const struct path *path); int (*path_truncate)(const struct path *path);

8
include/linux/security.h
View File

@@ -1442,9 +1442,9 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi
#endif /* CONFIG_SECURITY_NETWORK_XFRM */ #endif /* CONFIG_SECURITY_NETWORK_XFRM */
#ifdef CONFIG_SECURITY_PATH #ifdef CONFIG_SECURITY_PATH
int security_path_unlink(struct path *dir, struct dentry *dentry); int security_path_unlink(const struct path *dir, struct dentry *dentry);
int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t 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_rmdir(const struct path *dir, struct dentry *dentry);
int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode, int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
unsigned int dev); unsigned int dev);
int security_path_truncate(const struct path *path); int security_path_truncate(const struct path *path);
@@ -1459,7 +1459,7 @@ int security_path_chmod(const struct path *path, umode_t mode);
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid); int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid);
int security_path_chroot(struct path *path); int security_path_chroot(struct path *path);
#else /* CONFIG_SECURITY_PATH */ #else /* CONFIG_SECURITY_PATH */
static inline int security_path_unlink(struct path *dir, struct dentry *dentry) static inline int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
return 0; return 0;
} }
@@ -1470,7 +1470,7 @@ static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,
return 0; return 0;
} }
static inline int security_path_rmdir(struct path *dir, struct dentry *dentry) static inline int security_path_rmdir(const struct path *dir, struct dentry *dentry)
{ {
return 0; return 0;
} }

4
security/apparmor/lsm.c
View File

@@ -245,7 +245,7 @@ static int common_perm_create(int op, const struct path *dir,
return common_perm_dir_dentry(op, dir, dentry, mask, &cond); return common_perm_dir_dentry(op, dir, dentry, mask, &cond);
} }
static int apparmor_path_unlink(struct path *dir, struct dentry *dentry) static int apparmor_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
return common_perm_rm(OP_UNLINK, dir, dentry, AA_MAY_DELETE); return common_perm_rm(OP_UNLINK, dir, dentry, AA_MAY_DELETE);
} }
@@ -257,7 +257,7 @@ static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry,
S_IFDIR); S_IFDIR);
} }
static int apparmor_path_rmdir(struct path *dir, struct dentry *dentry) static int apparmor_path_rmdir(const struct path *dir, struct dentry *dentry)
{ {
return common_perm_rm(OP_RMDIR, dir, dentry, AA_MAY_DELETE); return common_perm_rm(OP_RMDIR, dir, dentry, AA_MAY_DELETE);
} }

4
security/security.c
View File

@@ -427,14 +427,14 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode)
} }
EXPORT_SYMBOL(security_path_mkdir); EXPORT_SYMBOL(security_path_mkdir);
int security_path_rmdir(struct path *dir, struct dentry *dentry) int security_path_rmdir(const struct path *dir, struct dentry *dentry)
{ {
if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry)))) if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry))))
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
int security_path_unlink(struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry)))) if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry))))
return 0; return 0;

4
security/tomoyo/tomoyo.c
View File

@@ -163,7 +163,7 @@ static int tomoyo_path_truncate(const struct path *path)
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry) static int tomoyo_path_unlink(const struct path *parent, struct dentry *dentry)
{ {
struct path path = { parent->mnt, dentry }; struct path path = { parent->mnt, dentry };
return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL); return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
@@ -194,7 +194,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry) static int tomoyo_path_rmdir(const struct path *parent, struct dentry *dentry)
{ {
struct path path = { parent->mnt, dentry }; struct path path = { parent->mnt, dentry };
return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL); return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);