VFS: POSIX ACL fixes
cover VFS: POSIX ACL fixes
Al,
here are two small POSIX ACL fixes; please merge.
Thanks,
Andreas
Andreas Gruenbacher (2):
vfs: Check attribute names in posix acl xattr handers
vfs: Fix the posix_acl_xattr_list return value
fs/posix_acl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
2.5.0
PATCH 1/2 vfs: Check attribute names in posix acl xattr handers
The get and set operations of the POSIX ACL xattr handlers failed to check the attribute names, so all names with "system.posix_acl_access" or "system.posix_acl_default" as a prefix were accepted. Reject invalid names from now on.
--- fs/posix_acl.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/posix_acl.c +4 -0
@@ -768,6 +768,8 @@ posix_acl_xattr_get(struct dentry *dentry, const char *name,struct posix_acl *acl;int error; +if (strcmp (name,"" ) !=0 ) +return -EINVAL ;if (!IS_POSIXACL (d_backing_inode (dentry)))return -EOPNOTSUPP ;if (d_is_symlink (dentry))
@@ -793,6 +795,8 @@ posix_acl_xattr_set(struct dentry *dentry, const char *name,struct posix_acl *acl =NULL ;int ret; +if (strcmp (name,"" ) !=0 ) +return -EINVAL ;if (!IS_POSIXACL (inode))return -EOPNOTSUPP ;if (!inode->i_op->set_acl)
Signature · 1 line
2.5.0
PATCH 2/2 vfs: Fix the posix_acl_xattr_list return value
In reply to Andreas GruenbacherWhen a filesystem that contains POSIX ACLs is mounted without ACL support (-o noacl), the appropriate behavior is not to list any existing POSIX ACL xattrs. The return value for list xattr handlers in this case is 0, not an error code: several filesystems that use the POSIX ACL xattr handlers do not expect the list operation to fail.
Symlinks cannot have ACLs, so posix_acl_xattr_list will never be called for symlinks in the first place.
--- fs/posix_acl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/posix_acl.c +1 -3
@@ -833,9 +833,7 @@ posix_acl_xattr_list(struct dentry *dentry, char *list, size_t list_size,size_t size;if (!IS_POSIXACL (d_backing_inode (dentry))) -return -EOPNOTSUPP ; -if (d_is_symlink (dentry)) -return -EOPNOTSUPP ; +return 0 ;if (type ==ACL_TYPE_ACCESS ) xname =POSIX_ACL_XATTR_ACCESS ;
Signature · 1 line
2.5.0