diff options
author | Jim Owens <jowens@hp.com> | 2009-02-04 09:29:13 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-02-04 09:29:13 -0500 |
commit | 0279b4cd86685b5eea467c1b74ce94f0add2c0a3 (patch) | |
tree | 54caafd4c6b31e2bc9861217627297c00af89066 /fs/btrfs/inode.c | |
parent | bef62ef339c15d7721da88958b03f7b544464722 (diff) |
Btrfs: selinux support
Add call to LSM security initialization and save
resulting security xattr for new inodes.
Add xattr support to symlink inode ops.
Set inode->i_op for existing special files.
Signed-off-by: jim owens <jowens@hp.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2bb65e9b1448..4a79e1c5ebd0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -90,6 +90,16 @@ static noinline int cow_file_range(struct inode *inode, | |||
90 | u64 start, u64 end, int *page_started, | 90 | u64 start, u64 end, int *page_started, |
91 | unsigned long *nr_written, int unlock); | 91 | unsigned long *nr_written, int unlock); |
92 | 92 | ||
93 | static int btrfs_init_inode_security(struct inode *inode, struct inode *dir) | ||
94 | { | ||
95 | int err; | ||
96 | |||
97 | err = btrfs_init_acl(inode, dir); | ||
98 | if (!err) | ||
99 | err = btrfs_xattr_security_init(inode, dir); | ||
100 | return err; | ||
101 | } | ||
102 | |||
93 | /* | 103 | /* |
94 | * a very lame attempt at stopping writes when the FS is 85% full. There | 104 | * a very lame attempt at stopping writes when the FS is 85% full. There |
95 | * are countless ways this is incorrect, but it is better than nothing. | 105 | * are countless ways this is incorrect, but it is better than nothing. |
@@ -2037,6 +2047,7 @@ void btrfs_read_locked_inode(struct inode *inode) | |||
2037 | inode->i_mapping->backing_dev_info = &root->fs_info->bdi; | 2047 | inode->i_mapping->backing_dev_info = &root->fs_info->bdi; |
2038 | break; | 2048 | break; |
2039 | default: | 2049 | default: |
2050 | inode->i_op = &btrfs_special_inode_operations; | ||
2040 | init_special_inode(inode, inode->i_mode, rdev); | 2051 | init_special_inode(inode, inode->i_mode, rdev); |
2041 | break; | 2052 | break; |
2042 | } | 2053 | } |
@@ -3584,7 +3595,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, | |||
3584 | if (IS_ERR(inode)) | 3595 | if (IS_ERR(inode)) |
3585 | goto out_unlock; | 3596 | goto out_unlock; |
3586 | 3597 | ||
3587 | err = btrfs_init_acl(inode, dir); | 3598 | err = btrfs_init_inode_security(inode, dir); |
3588 | if (err) { | 3599 | if (err) { |
3589 | drop_inode = 1; | 3600 | drop_inode = 1; |
3590 | goto out_unlock; | 3601 | goto out_unlock; |
@@ -3647,7 +3658,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, | |||
3647 | if (IS_ERR(inode)) | 3658 | if (IS_ERR(inode)) |
3648 | goto out_unlock; | 3659 | goto out_unlock; |
3649 | 3660 | ||
3650 | err = btrfs_init_acl(inode, dir); | 3661 | err = btrfs_init_inode_security(inode, dir); |
3651 | if (err) { | 3662 | if (err) { |
3652 | drop_inode = 1; | 3663 | drop_inode = 1; |
3653 | goto out_unlock; | 3664 | goto out_unlock; |
@@ -3770,7 +3781,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
3770 | 3781 | ||
3771 | drop_on_err = 1; | 3782 | drop_on_err = 1; |
3772 | 3783 | ||
3773 | err = btrfs_init_acl(inode, dir); | 3784 | err = btrfs_init_inode_security(inode, dir); |
3774 | if (err) | 3785 | if (err) |
3775 | goto out_fail; | 3786 | goto out_fail; |
3776 | 3787 | ||
@@ -4732,7 +4743,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, | |||
4732 | if (IS_ERR(inode)) | 4743 | if (IS_ERR(inode)) |
4733 | goto out_unlock; | 4744 | goto out_unlock; |
4734 | 4745 | ||
4735 | err = btrfs_init_acl(inode, dir); | 4746 | err = btrfs_init_inode_security(inode, dir); |
4736 | if (err) { | 4747 | if (err) { |
4737 | drop_inode = 1; | 4748 | drop_inode = 1; |
4738 | goto out_unlock; | 4749 | goto out_unlock; |
@@ -5043,4 +5054,8 @@ static struct inode_operations btrfs_symlink_inode_operations = { | |||
5043 | .follow_link = page_follow_link_light, | 5054 | .follow_link = page_follow_link_light, |
5044 | .put_link = page_put_link, | 5055 | .put_link = page_put_link, |
5045 | .permission = btrfs_permission, | 5056 | .permission = btrfs_permission, |
5057 | .setxattr = btrfs_setxattr, | ||
5058 | .getxattr = btrfs_getxattr, | ||
5059 | .listxattr = btrfs_listxattr, | ||
5060 | .removexattr = btrfs_removexattr, | ||
5046 | }; | 5061 | }; |