Skip to contentSkip to conversation

ovl: skip getxattr of security labels

PATCH Applied Amir Goldstein 2 participants 3 messages Dec 19, 2020 – Jan 20, 2021 Overlay filesystem

lore
Share & tools
lore

Amir Goldstein

author maintainer
#0 lore raw

PATCH 1/1 ovl: skip getxattr of security labels

When inode has no listxattr op of its own (e.g. squashfs) vfs_listxattr calls the LSM inode_listsecurity hooks to list the xattrs that LSMs will intercept in inode_getxattr hooks.

When selinux LSM is installed but not initialized, it will list the security.selinux xattr in inode_listsecurity, but will not intercept it in inode_getxattr. This results in -ENODATA for a getxattr call for an xattr returned by listxattr.

This situation was manifested as overlayfs failure to copy up lower files from squashfs when selinux is built-in but not initialized, because ovl_copy_xattr() iterates the lower inode xattrs by vfs_listxattr() and vfs_getxattr().

ovl_copy_xattr() skips copy up of security labels that are indentified by inode_copy_up_xattr LSM hooks, but it does that after vfs_getxattr(). Since we are not going to copy them, skip vfs_getxattr() of the security labels.

---

Miklos,

This is a workaround for a v5.9 selinux related regression reported by Michael that caused copy up failure is a very specific configuration involving lower squashfs and built-in but disabled selinux.

I've sent the bug fix to selinux list, so this patch is complementary. I removed the stable/Fixes tags, because this patch does not cleanly apply to v5.9 and is not the real bug fix.

Thanks,
Amir.

 fs/overlayfs/copy_up.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +8 -7
index e5b616c93e11..0fed532efa68 100644
@@ -84,6 +84,14 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
 
 		if (ovl_is_private_xattr(sb, name))
 			continue;
+
+		error = security_inode_copy_up_xattr(name);
+		if (error < 0 && error != -EOPNOTSUPP)
+			break;
+		if (error == 1) {
+			error = 0;
+			continue; /* Discard */
+		}
 retry:
 		size = vfs_getxattr(old, name, value, value_size);
 		if (size == -ERANGE)
@@ -107,13 +115,6 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
 			goto retry;
 		}
 
-		error = security_inode_copy_up_xattr(name);
-		if (error < 0 && error != -EOPNOTSUPP)
-			break;
-		if (error == 1) {
-			error = 0;
-			continue; /* Discard */
-		}
 		error = vfs_setxattr(new, name, value, size, 0);
 		if (error) {
 			if (error != -EOPNOTSUPP || ovl_must_copy_xattr(name))
Signature · 1 line
2.25.1
author maintainer
#1 lore raw
Quoted 28 lines · Amir Goldstein

When inode has no listxattr op of its own (e.g. squashfs) vfs_listxattr calls the LSM inode_listsecurity hooks to list the xattrs that LSMs will intercept in inode_getxattr hooks.

When selinux LSM is installed but not initialized, it will list the security.selinux xattr in inode_listsecurity, but will not intercept it in inode_getxattr. This results in -ENODATA for a getxattr call for an xattr returned by listxattr.

This situation was manifested as overlayfs failure to copy up lower files from squashfs when selinux is built-in but not initialized, because ovl_copy_xattr() iterates the lower inode xattrs by vfs_listxattr() and vfs_getxattr().

ovl_copy_xattr() skips copy up of security labels that are indentified by inode_copy_up_xattr LSM hooks, but it does that after vfs_getxattr(). Since we are not going to copy them, skip vfs_getxattr() of the security labels.

---

Miklos,

Quoted 8 lines

This is a workaround for a v5.9 selinux related regression reported by Michael that caused copy up failure is a very specific configuration involving lower squashfs and built-in but disabled selinux.

I've sent the bug fix to selinux list, so this patch is complementary. I removed the stable/Fixes tags, because this patch does not cleanly apply to v5.9 and is not the real bug fix.

Ping.

FWIW, the selinux bug fix should already be in next.

Thanks,
Amir.

Quoted 40 lines
 fs/overlayfs/copy_up.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +8 -8
index e5b616c93e11..0fed532efa68 100644
@@ -84,6 +84,14 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
 
                if (ovl_is_private_xattr(sb, name))
                        continue;
+
+               error = security_inode_copy_up_xattr(name);
+               if (error < 0 && error != -EOPNOTSUPP)
+                       break;
+               if (error == 1) {
+                       error = 0;
+                       continue; /* Discard */
+               }
 retry:
                size = vfs_getxattr(old, name, value, value_size);
                if (size == -ERANGE)
@@ -107,13 +115,6 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
                        goto retry;
                }
 
-               error = security_inode_copy_up_xattr(name);
-               if (error < 0 && error != -EOPNOTSUPP)
-                       break;
-               if (error == 1) {
-                       error = 0;
-                       continue; /* Discard */
-               }
                error = vfs_setxattr(new, name, value, size, 0);
                if (error) {
                        if (error != -EOPNOTSUPP || ovl_must_copy_xattr(name))
--

2.25.1

maintainer Applied
#2 lore raw
Quoted 7 lines · Amir Goldstein
Quoted 4 lines · Amir Goldstein

This is a workaround for a v5.9 selinux related regression reported by Michael that caused copy up failure is a very specific configuration involving lower squashfs and built-in but disabled selinux.

Quoted 6 lines
Quoted 4 lines

I've sent the bug fix to selinux list, so this patch is complementary. I removed the stable/Fixes tags, because this patch does not cleanly apply to v5.9 and is not the real bug fix.

Ping.

Queued, thanks.

Miklos