Commit 24d7f48c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ovl-fixes-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs fixes from Miklos Szeredi:
 "Fix a regression introduced in v5.15, affecting copy up of files with
  'noatime' or 'sync' attributes to a tmpfs upper layer"

* tag 'ovl-fixes-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: don't fail copy up if no fileattr support on upper
  ovl: fix NULL pointer dereference in copy up warning
parents 1a2beb3d 94fd1975
...@@ -145,7 +145,7 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, ...@@ -145,7 +145,7 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old,
if (err == -ENOTTY || err == -EINVAL) if (err == -ENOTTY || err == -EINVAL)
return 0; return 0;
pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n", pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n",
old, err); old->dentry, err);
return err; return err;
} }
...@@ -157,7 +157,9 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, ...@@ -157,7 +157,9 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old,
*/ */
if (oldfa.flags & OVL_PROT_FS_FLAGS_MASK) { if (oldfa.flags & OVL_PROT_FS_FLAGS_MASK) {
err = ovl_set_protattr(inode, new->dentry, &oldfa); err = ovl_set_protattr(inode, new->dentry, &oldfa);
if (err) if (err == -EPERM)
pr_warn_once("copying fileattr: no xattr on upper\n");
else if (err)
return err; return err;
} }
...@@ -167,8 +169,16 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, ...@@ -167,8 +169,16 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old,
err = ovl_real_fileattr_get(new, &newfa); err = ovl_real_fileattr_get(new, &newfa);
if (err) { if (err) {
/*
* Returning an error if upper doesn't support fileattr will
* result in a regression, so revert to the old behavior.
*/
if (err == -ENOTTY || err == -EINVAL) {
pr_warn_once("copying fileattr: no support on upper\n");
return 0;
}
pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n", pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n",
new, err); new->dentry, err);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment