acct_on(): don't mess with freeze protection

BugLink: https://bugs.launchpad.net/bugs/1838700
commit 9419a3191dcb27f24478d288abaab697228d28e6 upstream.

What happens there is that we are replacing file->path.mnt of
a file we'd just opened with a clone and we need the write
count contribution to be transferred from original mount to
new one.  That's it.  We do *NOT* want any kind of freeze
protection for the duration of switchover.

IOW, we should just use __mnt_{want,drop}_write() for that
switchover; no need to bother with mnt_{want,drop}_write()
there.

Tested-by: Amir Goldstein <amir73il@gmail.com>
Reported-by: syzbot+2a73a6ea9507b7112141@syzkaller.appspotmail.com
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/internal.h b/fs/internal.h
index 337584bc937a09c70a95203bdf86c070509d5c1e..2ff0c3b63855c10023d3b3caa3aa6698874ae940 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -70,10 +70,8 @@ extern int sb_prepare_remount_readonly(struct super_block *);
 
 extern void __init mnt_init(void);
 
-extern int __mnt_want_write(struct vfsmount *);
 extern int __mnt_want_write_file(struct file *);
 extern int mnt_want_write_file_path(struct file *);
-extern void __mnt_drop_write(struct vfsmount *);
 extern void __mnt_drop_write_file(struct file *);
 extern void mnt_drop_write_file_path(struct file *);
 

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 45b1f56c6c2f9fb0db10fc912251955af04fc05e..4b0db44189544bb4797a249825212b5f79996af3 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -86,6 +86,8 @@ extern bool mnt_may_suid(struct vfsmount *mnt);
 
 struct path;
 extern struct vfsmount *clone_private_mount(const struct path *path);
+extern int __mnt_want_write(struct vfsmount *);
+extern void __mnt_drop_write(struct vfsmount *);
 
 struct file_system_type;
 extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,

diff --git a/kernel/acct.c b/kernel/acct.c
index addf7732fb562f5b0eb51a0bd8894aec81cc8afe..81f9831a785925382824fd765f574941d08e9e01 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -227,7 +227,7 @@ static int acct_on(struct filename *pathname)
                filp_close(file, NULL);
                return PTR_ERR(internal);
        }
-       err = mnt_want_write(internal);
+       err = __mnt_want_write(internal);
        if (err) {
                mntput(internal);
                kfree(acct);
@@ -252,7 +252,7 @@ static int acct_on(struct filename *pathname)
        old = xchg(&ns->bacct, &acct->pin);
        mutex_unlock(&acct->lock);
        pin_kill(old);
-       mnt_drop_write(mnt);
+       __mnt_drop_write(mnt);
        mntput(mnt);
        return 0;
 }