Skip to content

Commit

Permalink
constify security_path_{link,rename}
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Mar 28, 2016
1 parent 8db0185 commit 3ccee46
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions include/linux/lsm_hooks.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1369,10 +1369,10 @@ union security_list_options {
int (*path_truncate)(const struct path *path);
int (*path_symlink)(const struct path *dir, struct dentry *dentry,
const char *old_name);
int (*path_link)(struct dentry *old_dentry, struct path *new_dir,
int (*path_link)(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry);
int (*path_rename)(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir,
int (*path_rename)(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir,
struct dentry *new_dentry);
int (*path_chmod)(const struct path *path, umode_t mode);
int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid);
Expand Down
12 changes: 6 additions & 6 deletions include/linux/security.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1450,10 +1450,10 @@ int security_path_mknod(const struct path *dir, struct dentry *dentry, umode_t m
int security_path_truncate(const struct path *path);
int security_path_symlink(const struct path *dir, struct dentry *dentry,
const char *old_name);
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry);
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry,
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
unsigned int flags);
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);
Expand Down Expand Up @@ -1493,15 +1493,15 @@ static inline int security_path_symlink(const struct path *dir, struct dentry *d
}

static inline int security_path_link(struct dentry *old_dentry,
struct path *new_dir,
const struct path *new_dir,
struct dentry *new_dentry)
{
return 0;
}

static inline int security_path_rename(struct path *old_dir,
static inline int security_path_rename(const struct path *old_dir,
struct dentry *old_dentry,
struct path *new_dir,
const struct path *new_dir,
struct dentry *new_dentry,
unsigned int flags)
{
Expand Down
6 changes: 3 additions & 3 deletions security/apparmor/lsm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static int apparmor_path_symlink(const struct path *dir, struct dentry *dentry,
S_IFLNK);
}

static int apparmor_path_link(struct dentry *old_dentry, struct path *new_dir,
static int apparmor_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
{
struct aa_profile *profile;
Expand All @@ -295,8 +295,8 @@ static int apparmor_path_link(struct dentry *old_dentry, struct path *new_dir,
return error;
}

static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry)
static int apparmor_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry)
{
struct aa_profile *profile;
int error = 0;
Expand Down
6 changes: 3 additions & 3 deletions security/security.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,16 +450,16 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}

int security_path_link(struct dentry *old_dentry, struct path *new_dir,
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
{
if (unlikely(IS_PRIVATE(d_backing_inode(old_dentry))))
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}

int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry,
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
unsigned int flags)
{
if (unlikely(IS_PRIVATE(d_backing_inode(old_dentry)) ||
Expand Down
6 changes: 3 additions & 3 deletions security/tomoyo/tomoyo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static int tomoyo_path_mknod(const struct path *parent, struct dentry *dentry,
*
* Returns 0 on success, negative value otherwise.
*/
static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
static int tomoyo_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
{
struct path path1 = { new_dir->mnt, old_dentry };
Expand All @@ -283,9 +283,9 @@ static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
*
* Returns 0 on success, negative value otherwise.
*/
static int tomoyo_path_rename(struct path *old_parent,
static int tomoyo_path_rename(const struct path *old_parent,
struct dentry *old_dentry,
struct path *new_parent,
const struct path *new_parent,
struct dentry *new_dentry)
{
struct path path1 = { old_parent->mnt, old_dentry };
Expand Down

0 comments on commit 3ccee46

Please sign in to comment.