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

Commit 12204e24 authored by James Morris's avatar James Morris
Browse files

security: pass mount flags to security_sb_kern_mount() 



Pass mount flags to security_sb_kern_mount(), so security modules
can determine if a mount operation is being performed by the kernel.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
parent 459c19f5

fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void 
		goto out_free_secdata;

	BUG_ON(!mnt->mnt_sb);



 	error = security_sb_kern_mount(mnt->mnt_sb, secdata);

 	error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata);

 	if (error)

 		goto out_sb;

include/linux/security.h

+3 −3
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ struct security_operations { 
	int (*sb_alloc_security) (struct super_block *sb);

	void (*sb_free_security) (struct super_block *sb);

	int (*sb_copy_data) (char *orig, char *copy);

	int (*sb_kern_mount) (struct super_block *sb, void *data);

	int (*sb_kern_mount) (struct super_block *sb, int flags, void *data);

	int (*sb_show_options) (struct seq_file *m, struct super_block *sb);

	int (*sb_statfs) (struct dentry *dentry);

	int (*sb_mount) (char *dev_name, struct path *path,
@@ -1575,7 +1575,7 @@ int security_bprm_secureexec(struct linux_binprm *bprm); 
int security_sb_alloc(struct super_block *sb);

void security_sb_free(struct super_block *sb);

int security_sb_copy_data(char *orig, char *copy);

int security_sb_kern_mount(struct super_block *sb, void *data);

int security_sb_kern_mount(struct super_block *sb, int flags, void *data);

int security_sb_show_options(struct seq_file *m, struct super_block *sb);

int security_sb_statfs(struct dentry *dentry);

int security_sb_mount(char *dev_name, struct path *path,
@@ -1850,7 +1850,7 @@ static inline int security_sb_copy_data(char *orig, char *copy) 
	return 0;

}



static inline int security_sb_kern_mount(struct super_block *sb, void *data)

static inline int security_sb_kern_mount(struct super_block *sb, int flags, void *data)

{

	return 0;

}

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int cap_sb_copy_data(char *orig, char *copy) 
	return 0;

}



static int cap_sb_kern_mount(struct super_block *sb, void *data)

static int cap_sb_kern_mount(struct super_block *sb, int flags, void *data)

{

	return 0;

}

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -254,9 +254,9 @@ int security_sb_copy_data(char *orig, char *copy) 
}

EXPORT_SYMBOL(security_sb_copy_data);



int security_sb_kern_mount(struct super_block *sb, void *data)

int security_sb_kern_mount(struct super_block *sb, int flags, void *data)

{

	return security_ops->sb_kern_mount(sb, data);

	return security_ops->sb_kern_mount(sb, flags, data);

}



int security_sb_show_options(struct seq_file *m, struct super_block *sb)

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@ static int selinux_sb_copy_data(char *orig, char *copy) 
	return rc;

}



static int selinux_sb_kern_mount(struct super_block *sb, void *data)

static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data)

{

	const struct cred *cred = current_cred();

	struct avc_audit_data ad;