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

Commit 989f74e0 authored by Al Viro's avatar Al Viro
Browse files

constify security_path_{unlink,rmdir} 



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

include/linux/lsm_hooks.h

+2 −2
Original line number Diff line number Diff line
@@ -1360,10 +1360,10 @@ union security_list_options { 




#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,

				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,

				umode_t mode, unsigned int dev);

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

include/linux/security.h

+4 −4
Original line number Diff line number Diff line
@@ -1442,9 +1442,9 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi 
#endif	/* CONFIG_SECURITY_NETWORK_XFRM */



#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_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,

			unsigned int dev);

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_chroot(struct path *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;

}
@@ -1470,7 +1470,7 @@ static inline int security_path_mkdir(struct path *dir, struct dentry *dentry, 
	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;

}

security/apparmor/lsm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}



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);

}
@@ -257,7 +257,7 @@ static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry, 
				  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);

}

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -427,14 +427,14 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode) 
}

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))))

		return 0;

	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))))

		return 0;

security/tomoyo/tomoyo.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int tomoyo_path_truncate(const struct path *path) 
 *

 * 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 };

	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.

 */

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 };

	return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);