Merge remote-tracking branch 'selinux/next'

[deliverable/linux.git] / fs / overlayfs / copy_up.c

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index cd65f12b3464d089327014e290f1e6ca0cf54021..db37a0e02d32b6e351a396e55f3ce9cb75e8b3a5 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -80,6 +80,8 @@ int ovl_copy_xattr(struct dentry *old, struct dentry *new)
        }
 
        for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
+               if (ovl_is_private_xattr(name))
+                       continue;
 retry:
                size = vfs_getxattr(old, name, value, value_size);
                if (size == -ERANGE)