Commit 3db29101 authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

security: remove dead hook sb_post_addmount 



Unused hook.  Remove.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 82dab104

fs/namespace.c

+0 −2
Original line number Diff line number Diff line
@@ -1436,8 +1436,6 @@ static int graft_tree(struct vfsmount *mnt, struct path *path) 
		err = attach_recursive_mnt(mnt, path, NULL);

out_unlock:

	mutex_unlock(&path->dentry->d_inode->i_mutex);

	if (!err)

		security_sb_post_addmount(mnt, path);

	return err;

}

include/linux/security.h

+0 −13
Original line number Diff line number Diff line
@@ -272,12 +272,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@mnt contains the mounted file system.

 *	@flags contains the unmount flags, e.g. MNT_FORCE.

 *	Return 0 if permission is granted.

 * @sb_post_addmount:

 *	Update the security module's state when a filesystem is mounted.

 *	This hook is called any time a mount is successfully grafetd to

 *	the tree.

 *	@mnt contains the mounted filesystem.

 *	@mountpoint contains the path for the mount point.

 * @sb_pivotroot:

 *	Check permission before pivoting the root filesystem.

 *	@old_path contains the path for the new location of the current root (put_old).
@@ -1462,8 +1456,6 @@ struct security_operations { 
	int (*sb_mount) (char *dev_name, struct path *path,

			 char *type, unsigned long flags, void *data);

	int (*sb_umount) (struct vfsmount *mnt, int flags);

	void (*sb_post_addmount) (struct vfsmount *mnt,

				  struct path *mountpoint);

	int (*sb_pivotroot) (struct path *old_path,

			     struct path *new_path);

	void (*sb_post_pivotroot) (struct path *old_path,
@@ -1756,7 +1748,6 @@ int security_sb_statfs(struct dentry *dentry); 
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);

void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint);

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);
@@ -2072,10 +2063,6 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static inline void security_sb_post_addmount(struct vfsmount *mnt,

					     struct path *mountpoint)

{ }



static inline int security_sb_pivotroot(struct path *old_path,

					struct path *new_path)

{

security/capability.c

+0 −5
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ static int cap_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static void cap_sb_post_addmount(struct vfsmount *mnt, struct path *path)

{

}



static int cap_sb_pivotroot(struct path *old_path, struct path *new_path)

{

	return 0;
@@ -924,7 +920,6 @@ void security_fixup_ops(struct security_operations *ops) 
	set_to_cap_if_null(ops, sb_statfs);

	set_to_cap_if_null(ops, sb_mount);

	set_to_cap_if_null(ops, sb_umount);

	set_to_cap_if_null(ops, sb_post_addmount);

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

security/security.c

+0 −5
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ int security_sb_umount(struct vfsmount *mnt, int flags) 
	return security_ops->sb_umount(mnt, flags);

}



void security_sb_post_addmount(struct vfsmount *mnt, struct path *mountpoint)

{

	security_ops->sb_post_addmount(mnt, mountpoint);

}



int security_sb_pivotroot(struct path *old_path, struct path *new_path)

{

	return security_ops->sb_pivotroot(old_path, new_path);