Skip to contentSkip to conversation

ovl: fix missing upper fs freeze protection on copy up for ioctl

PATCH Applied Amir Goldstein 3 participants 7 messages Jan 22, 2019 – May 6, 2019 Overlay filesystem

lore
Share & tools
lore

Amir Goldstein

author maintainer
#0 lore raw

PATCH 1/1 ovl: fix missing upper fs freeze protection on copy up for ioctl

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19
---
 fs/overlayfs/copy_up.c   | 6 +++---
 fs/overlayfs/file.c      | 5 ++---
 fs/overlayfs/overlayfs.h | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +3 -3
index 48119b23375b..0c0e11d529d0 100644
@@ -885,14 +885,14 @@ static bool ovl_open_need_copy_up(struct dentry *dentry, int flags)
 	return true;
 }
 
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags)
+int ovl_maybe_copy_up(struct dentry *dentry, int flags)
 {
 	int err = 0;
 
-	if (ovl_open_need_copy_up(dentry, file_flags)) {
+	if (ovl_open_need_copy_up(dentry, flags)) {
 		err = ovl_want_write(dentry);
 		if (!err) {
-			err = ovl_copy_up_flags(dentry, file_flags);
+			err = ovl_copy_up_flags(dentry, flags);
 			ovl_drop_write(dentry);
 		}
 	}
fs/overlayfs/file.c +2 -3
index 84dd957efa24..50e4407398d8 100644
@@ -116,11 +116,10 @@ static int ovl_real_fdget(const struct file *file, struct fd *real)
 
 static int ovl_open(struct inode *inode, struct file *file)
 {
-	struct dentry *dentry = file_dentry(file);
 	struct file *realfile;
 	int err;
 
-	err = ovl_open_maybe_copy_up(dentry, file->f_flags);
+	err = ovl_maybe_copy_up(file_dentry(file), file->f_flags);
 	if (err)
 		return err;
 
@@ -390,7 +389,7 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (ret)
 			return ret;
 
-		ret = ovl_copy_up_with_data(file_dentry(file));
+		ret = ovl_maybe_copy_up(file_dentry(file), O_WRONLY);
 		if (!ret) {
 			ret = ovl_real_ioctl(file, cmd, arg);
 
fs/overlayfs/overlayfs.h +1 -1
index 5e45cb3630a0..767eeaf73bf1 100644
@@ -419,7 +419,7 @@ extern const struct file_operations ovl_file_operations;
 int ovl_copy_up(struct dentry *dentry);
 int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_copy_up_flags(struct dentry *dentry, int flags);
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags);
+int ovl_maybe_copy_up(struct dentry *dentry, int flags);
 int ovl_copy_xattr(struct dentry *old, struct dentry *new);
 int ovl_set_attr(struct dentry *upper, struct kstat *stat);
 struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 6 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

What upper fs freeze protection you are referring to. I am unable to see it in this new path.

Vivek

Quoted 70 lines
---
 fs/overlayfs/copy_up.c   | 6 +++---
 fs/overlayfs/file.c      | 5 ++---
 fs/overlayfs/overlayfs.h | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +3 -3
index 48119b23375b..0c0e11d529d0 100644
@@ -885,14 +885,14 @@ static bool ovl_open_need_copy_up(struct dentry *dentry, int flags)
 	return true;
 }
 
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags)
+int ovl_maybe_copy_up(struct dentry *dentry, int flags)
 {
 	int err = 0;
 
-	if (ovl_open_need_copy_up(dentry, file_flags)) {
+	if (ovl_open_need_copy_up(dentry, flags)) {
 		err = ovl_want_write(dentry);
 		if (!err) {
-			err = ovl_copy_up_flags(dentry, file_flags);
+			err = ovl_copy_up_flags(dentry, flags);
 			ovl_drop_write(dentry);
 		}
 	}
fs/overlayfs/file.c +2 -3
index 84dd957efa24..50e4407398d8 100644
@@ -116,11 +116,10 @@ static int ovl_real_fdget(const struct file *file, struct fd *real)
 
 static int ovl_open(struct inode *inode, struct file *file)
 {
-	struct dentry *dentry = file_dentry(file);
 	struct file *realfile;
 	int err;
 
-	err = ovl_open_maybe_copy_up(dentry, file->f_flags);
+	err = ovl_maybe_copy_up(file_dentry(file), file->f_flags);
 	if (err)
 		return err;
 
@@ -390,7 +389,7 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (ret)
 			return ret;
 
-		ret = ovl_copy_up_with_data(file_dentry(file));
+		ret = ovl_maybe_copy_up(file_dentry(file), O_WRONLY);
 		if (!ret) {
 			ret = ovl_real_ioctl(file, cmd, arg);
 
fs/overlayfs/overlayfs.h +1 -1
index 5e45cb3630a0..767eeaf73bf1 100644
@@ -419,7 +419,7 @@ extern const struct file_operations ovl_file_operations;
 int ovl_copy_up(struct dentry *dentry);
 int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_copy_up_flags(struct dentry *dentry, int flags);
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags);
+int ovl_maybe_copy_up(struct dentry *dentry, int flags);
 int ovl_copy_xattr(struct dentry *old, struct dentry *new);
 int ovl_set_attr(struct dentry *upper, struct kstat *stat);
 struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper);
Signature · 1 line
2.17.1
author maintainer
#2 lore raw
Quoted 5 lines · Vivek Goyal
Quoted 3 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Quoted 7 lines
Quoted 3 lines
Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

What upper fs freeze protection you are referring to. I am unable to see it in this new path.

Changed from calling ovl_copy_up_with_data() to calling ovl_maybe_copy_up().
The former doesn't have ovl_want_write()/ovl_drop_write().

The FS_IOC_SETFLAGS ioctl is a bit of an odd ball in vfs, which probably caused the confusion.
File may be open O_RDONLY, but ioctl modifies the file. VFS does not call mnt_want_write_file() nor lock inode mutex, but fs-specific code for FS_IOC_SETFLAGS does.
So ovl_ioctl() calls mnt_want_write_file() for the overlay file, and fs-specific code calls mnt_want_write_file() for upper fs file, but there was no call for ovl_want_write() for copy up duration which prevents overlayfs from copying up on a frozen upper fs.

Thanks,
Amir.

Acked-by
#3 lore raw
Quoted 18 lines · Amir Goldstein
Quoted 5 lines · Vivek Goyal
Quoted 3 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Quoted 7 lines
Quoted 3 lines
Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

What upper fs freeze protection you are referring to. I am unable to see it in this new path.

Changed from calling ovl_copy_up_with_data() to calling ovl_maybe_copy_up().
The former doesn't have ovl_want_write()/ovl_drop_write().

Quoted 10 lines

The FS_IOC_SETFLAGS ioctl is a bit of an odd ball in vfs, which probably caused the confusion.
File may be open O_RDONLY, but ioctl modifies the file. VFS does not call mnt_want_write_file() nor lock inode mutex, but fs-specific code for FS_IOC_SETFLAGS does.
So ovl_ioctl() calls mnt_want_write_file() for the overlay file, and fs-specific code calls mnt_want_write_file() for upper fs file, but there was no call for ovl_want_write() for copy up duration which prevents overlayfs from copying up on a frozen upper fs.

Ok, thanks for the explanaiton. I understand it better now.

Vivek

author maintainer
#4 lore raw
In reply to Amir Goldstein
Quoted 8 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

---

Miklos,

Ping for this bug fix.

Thanks,
Amir.

Quoted 69 lines
 fs/overlayfs/copy_up.c   | 6 +++---
 fs/overlayfs/file.c      | 5 ++---
 fs/overlayfs/overlayfs.h | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +3 -3
index 48119b23375b..0c0e11d529d0 100644
@@ -885,14 +885,14 @@ static bool ovl_open_need_copy_up(struct dentry *dentry, int flags)
        return true;
 }
 
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags)
+int ovl_maybe_copy_up(struct dentry *dentry, int flags)
 {
        int err = 0;
 
-       if (ovl_open_need_copy_up(dentry, file_flags)) {
+       if (ovl_open_need_copy_up(dentry, flags)) {
                err = ovl_want_write(dentry);
                if (!err) {
-                       err = ovl_copy_up_flags(dentry, file_flags);
+                       err = ovl_copy_up_flags(dentry, flags);
                        ovl_drop_write(dentry);
                }
        }
fs/overlayfs/file.c +2 -3
index 84dd957efa24..50e4407398d8 100644
@@ -116,11 +116,10 @@ static int ovl_real_fdget(const struct file *file, struct fd *real)
 
 static int ovl_open(struct inode *inode, struct file *file)
 {
-       struct dentry *dentry = file_dentry(file);
        struct file *realfile;
        int err;
 
-       err = ovl_open_maybe_copy_up(dentry, file->f_flags);
+       err = ovl_maybe_copy_up(file_dentry(file), file->f_flags);
        if (err)
                return err;
 
@@ -390,7 +389,7 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                if (ret)
                        return ret;
 
-               ret = ovl_copy_up_with_data(file_dentry(file));
+               ret = ovl_maybe_copy_up(file_dentry(file), O_WRONLY);
                if (!ret) {
                        ret = ovl_real_ioctl(file, cmd, arg);
 
fs/overlayfs/overlayfs.h +1 -2
index 5e45cb3630a0..767eeaf73bf1 100644
@@ -419,7 +419,7 @@ extern const struct file_operations ovl_file_operations;
 int ovl_copy_up(struct dentry *dentry);
 int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_copy_up_flags(struct dentry *dentry, int flags);
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags);
+int ovl_maybe_copy_up(struct dentry *dentry, int flags);
 int ovl_copy_xattr(struct dentry *old, struct dentry *new);
 int ovl_set_attr(struct dentry *upper, struct kstat *stat);
 struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper);
--

2.17.1

author maintainer
#5 lore raw
Quoted 6 lines · Amir Goldstein
Quoted 4 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Quoted 9 lines
Quoted 4 lines
Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

---

Miklos,

Ping for this bug fix.

PING^2

Quoted 72 lines

Thanks,
Amir.

Quoted 69 lines
 fs/overlayfs/copy_up.c   | 6 +++---
 fs/overlayfs/file.c      | 5 ++---
 fs/overlayfs/overlayfs.h | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
fs/overlayfs/copy_up.c +3 -3
index 48119b23375b..0c0e11d529d0 100644
@@ -885,14 +885,14 @@ static bool ovl_open_need_copy_up(struct dentry *dentry, int flags)
        return true;
 }
 
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags)
+int ovl_maybe_copy_up(struct dentry *dentry, int flags)
 {
        int err = 0;
 
-       if (ovl_open_need_copy_up(dentry, file_flags)) {
+       if (ovl_open_need_copy_up(dentry, flags)) {
                err = ovl_want_write(dentry);
                if (!err) {
-                       err = ovl_copy_up_flags(dentry, file_flags);
+                       err = ovl_copy_up_flags(dentry, flags);
                        ovl_drop_write(dentry);
                }
        }
fs/overlayfs/file.c +2 -3
index 84dd957efa24..50e4407398d8 100644
@@ -116,11 +116,10 @@ static int ovl_real_fdget(const struct file *file, struct fd *real)
 
 static int ovl_open(struct inode *inode, struct file *file)
 {
-       struct dentry *dentry = file_dentry(file);
        struct file *realfile;
        int err;
 
-       err = ovl_open_maybe_copy_up(dentry, file->f_flags);
+       err = ovl_maybe_copy_up(file_dentry(file), file->f_flags);
        if (err)
                return err;
 
@@ -390,7 +389,7 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                if (ret)
                        return ret;
 
-               ret = ovl_copy_up_with_data(file_dentry(file));
+               ret = ovl_maybe_copy_up(file_dentry(file), O_WRONLY);
                if (!ret) {
                        ret = ovl_real_ioctl(file, cmd, arg);
 
fs/overlayfs/overlayfs.h +1 -2
index 5e45cb3630a0..767eeaf73bf1 100644
@@ -419,7 +419,7 @@ extern const struct file_operations ovl_file_operations;
 int ovl_copy_up(struct dentry *dentry);
 int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_copy_up_flags(struct dentry *dentry, int flags);
-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags);
+int ovl_maybe_copy_up(struct dentry *dentry, int flags);
 int ovl_copy_xattr(struct dentry *old, struct dentry *new);
 int ovl_set_attr(struct dentry *upper, struct kstat *stat);
 struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper);
--

2.17.1

maintainer Applied
#6 lore raw
Quoted 11 lines · Amir Goldstein
Quoted 9 lines · Amir Goldstein
Quoted 7 lines · Amir Goldstein

Generalize the helper ovl_open_maybe_copy_up() and use it to copy up file with data before FS_IOC_SETFLAGS ioctl.

Fixes dab5ca8fd9dd ("ovl: add lsattr/chattr support")
Cc <[email protected]> # v4.19

Thanks, applied.

Miklos