mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 13:14:07 +08:00
security: remove dead hook sb_post_pivotroot
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
3db2910177
commit
91a9420f58
@ -2265,7 +2265,6 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
|
||||
touch_mnt_namespace(current->nsproxy->mnt_ns);
|
||||
spin_unlock(&vfsmount_lock);
|
||||
chroot_fs_refs(&root, &new);
|
||||
security_sb_post_pivotroot(&root, &new);
|
||||
error = 0;
|
||||
path_put(&root_parent);
|
||||
path_put(&parent_path);
|
||||
|
@ -277,10 +277,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
|
||||
* @old_path contains the path for the new location of the current root (put_old).
|
||||
* @new_path contains the path for the new root (new_root).
|
||||
* Return 0 if permission is granted.
|
||||
* @sb_post_pivotroot:
|
||||
* Update module state after a successful pivot.
|
||||
* @old_path contains the path for the old root.
|
||||
* @new_path contains the path for the new root.
|
||||
* @sb_set_mnt_opts:
|
||||
* Set the security relevant mount options used for a superblock
|
||||
* @sb the superblock to set security mount options for
|
||||
@ -1458,8 +1454,6 @@ struct security_operations {
|
||||
int (*sb_umount) (struct vfsmount *mnt, int flags);
|
||||
int (*sb_pivotroot) (struct path *old_path,
|
||||
struct path *new_path);
|
||||
void (*sb_post_pivotroot) (struct path *old_path,
|
||||
struct path *new_path);
|
||||
int (*sb_set_mnt_opts) (struct super_block *sb,
|
||||
struct security_mnt_opts *opts);
|
||||
void (*sb_clone_mnt_opts) (const struct super_block *oldsb,
|
||||
@ -1749,7 +1743,6 @@ int security_sb_mount(char *dev_name, struct path *path,
|
||||
char *type, unsigned long flags, void *data);
|
||||
int security_sb_umount(struct vfsmount *mnt, int flags);
|
||||
int security_sb_pivotroot(struct path *old_path, struct path *new_path);
|
||||
void security_sb_post_pivotroot(struct path *old_path, struct path *new_path);
|
||||
int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
|
||||
void security_sb_clone_mnt_opts(const struct super_block *oldsb,
|
||||
struct super_block *newsb);
|
||||
@ -2069,10 +2062,6 @@ static inline int security_sb_pivotroot(struct path *old_path,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void security_sb_post_pivotroot(struct path *old_path,
|
||||
struct path *new_path)
|
||||
{ }
|
||||
|
||||
static inline int security_sb_set_mnt_opts(struct super_block *sb,
|
||||
struct security_mnt_opts *opts)
|
||||
{
|
||||
|
@ -90,10 +90,6 @@ static int cap_sb_pivotroot(struct path *old_path, struct path *new_path)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void cap_sb_post_pivotroot(struct path *old_path, struct path *new_path)
|
||||
{
|
||||
}
|
||||
|
||||
static int cap_sb_set_mnt_opts(struct super_block *sb,
|
||||
struct security_mnt_opts *opts)
|
||||
{
|
||||
@ -921,7 +917,6 @@ void security_fixup_ops(struct security_operations *ops)
|
||||
set_to_cap_if_null(ops, sb_mount);
|
||||
set_to_cap_if_null(ops, sb_umount);
|
||||
set_to_cap_if_null(ops, sb_pivotroot);
|
||||
set_to_cap_if_null(ops, sb_post_pivotroot);
|
||||
set_to_cap_if_null(ops, sb_set_mnt_opts);
|
||||
set_to_cap_if_null(ops, sb_clone_mnt_opts);
|
||||
set_to_cap_if_null(ops, sb_parse_opts_str);
|
||||
|
@ -316,11 +316,6 @@ int security_sb_pivotroot(struct path *old_path, struct path *new_path)
|
||||
return security_ops->sb_pivotroot(old_path, new_path);
|
||||
}
|
||||
|
||||
void security_sb_post_pivotroot(struct path *old_path, struct path *new_path)
|
||||
{
|
||||
security_ops->sb_post_pivotroot(old_path, new_path);
|
||||
}
|
||||
|
||||
int security_sb_set_mnt_opts(struct super_block *sb,
|
||||
struct security_mnt_opts *opts)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user