Btrfs: support security xattr with SELinux enabled
PATCH 1/1 Btrfs: support security xattr with SELinux enabled
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.
--- fs/btrfs/inode.c | 23 +++++++++++++++++++---- fs/btrfs/xattr.c | 32 ++++++++++++++++++++++++++++++++ fs/btrfs/xattr.h | 2 ++ 3 files changed, 53 insertions(+), 4 deletions(-)
fs/btrfs/inode.c +19 -4
@@ -91,6 +91,16 @@ static noinline int cow_file_range(struct inode *inode, u64 start, u64 end, int *page_started, unsigned long *nr_written, int unlock); +static int btrfs_init_inode_security (struct inode *inode,struct inode *dir) +{ +int err; + + err =btrfs_init_acl (inode, dir); +if (!err) + err =btrfs_xattr_security_init (inode, dir); +return err; +} +/* * a very lame attempt at stopping writes when the FS is 85% full. There * are countless ways this is incorrect, but it is better than nothing.
@@ -2039,6 +2049,7 @@ void btrfs_read_locked_inode(struct inode *inode) inode->i_mapping->backing_dev_info = &root->fs_info->bdi;break ;default : + inode->i_op = &btrfs_special_inode_operations;init_special_inode (inode, inode->i_mode, rdev);break ; }
@@ -3586,7 +3597,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry,if (IS_ERR (inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ; goto out_unlock;
@@ -3649,7 +3660,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,if (IS_ERR (inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ; goto out_unlock;
@@ -3772,7 +3783,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) drop_on_err =1 ; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) goto out_fail;
@@ -4733,7 +4744,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,if (IS_ERR (inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ; goto out_unlock;
@@ -5032,4 +5043,8 @@ static struct inode_operations btrfs_symlink_inode_operations = { .follow_link = page_follow_link_light, .put_link = page_put_link, .permission = btrfs_permission, + .setxattr = btrfs_setxattr, + .getxattr = btrfs_getxattr, + .listxattr = btrfs_listxattr, + .removexattr = btrfs_removexattr, };
fs/btrfs/xattr.c +32 -0
@@ -21,6 +21,7 @@#include <linux/slab.h> #include <linux/rwsem.h> #include <linux/xattr.h> +#include <linux/security.h> #include "ctree.h" #include "btrfs_inode.h" #include "transaction.h"
@@ -320,3 +321,34 @@ int btrfs_removexattr(struct dentry *dentry, const char *name)return -EOPNOTSUPP ;return __btrfs_setxattr (dentry->d_inode, name,NULL ,0 ,XATTR_REPLACE ); } + +int btrfs_xattr_security_init (struct inode *inode,struct inode *dir) +{ +int err; +size_t len; +void *value; +char *suffix; +char *name; + + err =security_inode_init_security (inode, dir, &suffix, &value, &len); +if (err) { +if (err == -EOPNOTSUPP ) +return 0 ; +return err; + } + + name =kmalloc (XATTR_SECURITY_PREFIX_LEN +strlen (suffix) +1 , +GFP_NOFS ); +if (!name) { + err = -ENOMEM ; + }else { +strcpy (name,XATTR_SECURITY_PREFIX ); +strcpy (name +XATTR_SECURITY_PREFIX_LEN , suffix); + err =__btrfs_setxattr (inode, name, value, len,0 ); +kfree (name); + } + +kfree (suffix); +kfree (value); +return err; +}
fs/btrfs/xattr.h +2 -0
@@ -36,4 +36,6 @@ extern int btrfs_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags);extern int btrfs_removexattr (struct dentry *dentry,const char *name); +extern int btrfs_xattr_security_init (struct inode *inode,struct inode *dir); +#endif /* __XATTR__ */
Signature · 1 line
1.5.4.3
Quoted 120 lines · jim owens
Add call to LSM security initialization and save
resulting security xattr for new inodes.Add xattr support to symlink inode ops.
Set
inode->i_opfor existing special files.Signed-off-by jim owens <[email protected]>--- fs/btrfs/inode.c | 23 +++++++++++++++++++---- fs/btrfs/xattr.c | 32 ++++++++++++++++++++++++++++++++ fs/btrfs/xattr.h | 2 ++ 3 files changed, 53 insertions(+), 4 deletions(-)fs/btrfs/inode.c +10
-0@@ -91,6 +91,16 @@ static noinline int cow_file_range(struct inode *inode, u64 start, u64 end, int *page_started, unsigned long *nr_written, int unlock); +static int btrfs_init_inode_security (struct inode *inode,struct inode *dir) +{ +int err; + + err =btrfs_init_acl (inode, dir); +if (!err) + err =btrfs_xattr_security_init (inode, dir); +return err; +} +/* * a very lame attempt at stopping writes when the FS is 85% full. There * are countless ways this is incorrect, but it is better than nothing.
fs/btrfs/inode.c +2
-1@@ -2039,6 +2049,7 @@ void btrfs_read_locked_inode(struct inode *inode) inode->i_mapping->backing_dev_info = &root->fs_info->bdi;break ;default : + inode->i_op = &btrfs_special_inode_operations;init_special_inode (inode, inode->i_mode, rdev);break ; }@@ -3586,7 +3597,7 @@ static int btrfs_mknod(struct inode *dir, structdentry *dentry, if (IS_ERR(inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ;fs/btrfs/inode.c +1
-1goto out_unlock;@@ -3649,7 +3660,7 @@ static int btrfs_create(struct inode *dir, structdentry *dentry, if (IS_ERR(inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ;fs/btrfs/inode.c +2
-2goto out_unlock;@@ -3772,7 +3783,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) drop_on_err =1 ; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) goto out_fail;@@ -4733,7 +4744,7 @@ static int btrfs_symlink(struct inode *dir, structdentry *dentry, if (IS_ERR(inode)) goto out_unlock; - err =btrfs_init_acl (inode, dir); + err =btrfs_init_inode_security (inode, dir);if (err) { drop_inode =1 ;fs/btrfs/inode.c +4
-0goto out_unlock;@@ -5032,4 +5043,8 @@ static struct inode_operations btrfs_symlink_inode_operations = { .follow_link = page_follow_link_light, .put_link = page_put_link, .permission = btrfs_permission, + .setxattr = btrfs_setxattr, + .getxattr = btrfs_getxattr, + .listxattr = btrfs_listxattr, + .removexattr = btrfs_removexattr,};
fs/btrfs/xattr.c +9
-0@@ -21,6 +21,7 @@#include <linux/slab.h> #include <linux/rwsem.h> #include <linux/xattr.h> +#include <linux/security.h> #include "ctree.h" #include "btrfs_inode.h" #include "transaction.h" @@ -320,3 +321,34 @@ int btrfs_removexattr(struct dentry *dentry, const char *name)return -EOPNOTSUPP ;return __btrfs_setxattr (dentry->d_inode, name,NULL ,0 ,XATTR_REPLACE ); } + +int btrfs_xattr_security_init (struct inode *inode,struct inode *dir) +{ +int err; +size_t len; +void *value; +char *suffix; +char *name;
fs/btrfs/xattr.c int btrfs_removexattr(struct dentry *dentry, const · line 341
Quoted 10 lines
fs/btrfs/xattr.c +10
-0+ + err =security_inode_init_security (inode, dir, &suffix, &value, &len); +if (err) { +if (err == -EOPNOTSUPP ) +return 0 ; +return err; + } + + name =kmalloc (XATTR_SECURITY_PREFIX_LEN +strlen (suffix) +1 , +GFP_NOFS );
Use kzalloc here otherwise the end of name could be some random thing and strlen() will read past the end of the memory. Thanks,
Josef
Quoted 13 lines · Josef Bacik
Quoted 12 lines · jim owens
fs/btrfs/xattr.c +12
-0+int btrfs_xattr_security_init (struct inode *inode,struct inode *dir) +{ +int err; +size_t len; +void *value; +char *suffix; +char *name; + + err =security_inode_init_security (inode, dir, &suffix, &value, &len); +if (err) { +if (err == -EOPNOTSUPP ) +return 0 ;
Quoted 8 lines
fs/btrfs/xattr.c int btrfs_removexattr(struct dentry *dentry, const char *name) · line 341
Quoted 5 lines
fs/btrfs/xattr.c +5
-0+return err; + } + + name =kmalloc (XATTR_SECURITY_PREFIX_LEN +strlen (suffix) +1 , +GFP_NOFS );Use kzalloc here otherwise the end of name could be some random thing and
strlen()will read past the end of the memory. Thanks,
I don't understand what you think can happen...
+ strcpy(name, XATTR_SECURITY_PREFIX);
+ strcpy(name + XATTR_SECURITY_PREFIX_LEN, suffix);
always forces "name" to be \0 terminated.
jim
Quoted 28 lines · jim owens
Quoted 13 lines · Josef Bacik
Quoted 12 lines · jim owens
fs/btrfs/xattr.c +12
-0+int btrfs_xattr_security_init (struct inode *inode,struct inode *dir) +{ +int err; +size_t len; +void *value; +char *suffix; +char *name; + + err =security_inode_init_security (inode, dir, &suffix, &value, &len); +if (err) { +if (err == -EOPNOTSUPP ) +return 0 ;Quoted 8 lines
fs/btrfs/xattr.c int btrfs_removexattr(struct dentry *dentry, const char *name) · line 341
Quoted 5 lines
fs/btrfs/xattr.c +5
-0+return err; + } + + name =kmalloc (XATTR_SECURITY_PREFIX_LEN +strlen (suffix) +1 , +GFP_NOFS );Use kzalloc here otherwise the end of name could be some random thing and
strlen()will read past the end of the memory. Thanks,I don't understand what you think can happen...
fs/btrfs/xattr.c +2
-0+strcpy (name,XATTR_SECURITY_PREFIX ); +strcpy (name +XATTR_SECURITY_PREFIX_LEN , suffix);
Quoted 2 lines
always forces "name" to be \0 terminated.
Oh derr sorry I forget suffix is \0 terminated. Nevermind.
Josef