adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

security: pass mount flags to security_sb_kern_mount()

Browse source 
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: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
James Morris 2008-12-19 10:44:42 +11:00
parent 459c19f524
commit 12204e24b1
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/super.c
View file

@ -914,7 +914,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
goto out_free_secdata; goto out_free_secdata;
BUG_ON(!mnt->mnt_sb); 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) if (error)
goto out_sb; goto out_sb;

6
include/linux/security.h
View file

@ -1308,7 +1308,7 @@ struct security_operations {
int (*sb_alloc_security) (struct super_block *sb); int (*sb_alloc_security) (struct super_block *sb);
void (*sb_free_security) (struct super_block *sb); void (*sb_free_security) (struct super_block *sb);
int (*sb_copy_data) (char *orig, char *copy); 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_show_options) (struct seq_file *m, struct super_block *sb);
int (*sb_statfs) (struct dentry *dentry); int (*sb_statfs) (struct dentry *dentry);
int (*sb_mount) (char *dev_name, struct path *path, 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); int security_sb_alloc(struct super_block *sb);
void security_sb_free(struct super_block *sb); void security_sb_free(struct super_block *sb);
int security_sb_copy_data(char *orig, char *copy); 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_show_options(struct seq_file *m, struct super_block *sb);
int security_sb_statfs(struct dentry *dentry); int security_sb_statfs(struct dentry *dentry);
int security_sb_mount(char *dev_name, struct path *path, 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; 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; return 0;
} }

2
security/capability.c
View file

@ -59,7 +59,7 @@ static int cap_sb_copy_data(char *orig, char *copy)
return 0; 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; return 0;
} }

4
security/security.c
View file

@ -254,9 +254,9 @@ int security_sb_copy_data(char *orig, char *copy)
} }
EXPORT_SYMBOL(security_sb_copy_data); 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) int security_sb_show_options(struct seq_file *m, struct super_block *sb)

2
security/selinux/hooks.c
View file

@ -2474,7 +2474,7 @@ out:
return rc; 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(); const struct cred *cred = current_cred();
struct avc_audit_data ad; struct avc_audit_data ad;

3
security/smack/smack_lsm.c
View file

@ -250,11 +250,12 @@ static int smack_sb_copy_data(char *orig, char *smackopts)
/** /**
* smack_sb_kern_mount - Smack specific mount processing * smack_sb_kern_mount - Smack specific mount processing
* @sb: the file system superblock * @sb: the file system superblock
* @flags: the mount flags
* @data: the smack mount options * @data: the smack mount options
* *
* Returns 0 on success, an error code on failure * Returns 0 on success, an error code on failure
*/ */
static int smack_sb_kern_mount(struct super_block *sb, void *data) static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
{ {
struct dentry *root = sb->s_root; struct dentry *root = sb->s_root;
struct inode *inode = root->d_inode; struct inode *inode = root->d_inode;