diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 19:00:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 19:00:05 -0700 |
commit | cbd76edeabd5ed078391abb2323b7aee790cdc04 (patch) | |
tree | ccf3af333f203cfd1f54fb14b0b5666ba5b76862 /kernel | |
parent | dbe0ee46614016146c1b3e1fc063b44333bb2401 (diff) | |
parent | 70f8d9c5750bbb0ca4ef7e23d6abcb05e6061138 (diff) | |
download | linux-stable-cbd76edeabd5ed078391abb2323b7aee790cdc04.tar.gz linux-stable-cbd76edeabd5ed078391abb2323b7aee790cdc04.tar.bz2 linux-stable-cbd76edeabd5ed078391abb2323b7aee790cdc04.zip |
Merge tag 'pull-18-rc1-work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull mount handling updates from Al Viro:
"Cleanups (and one fix) around struct mount handling.
The fix is usermode_driver.c one - once you've done kern_mount(), you
must kern_unmount(); simple mntput() will end up with a leak. Several
failure exits in there messed up that way... In practice you won't hit
those particular failure exits without fault injection, though"
* tag 'pull-18-rc1-work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
move mount-related externs from fs.h to mount.h
blob_to_mnt(): kern_unmount() is needed to undo kern_mount()
m->mnt_root->d_inode->i_sb is a weird way to spell m->mnt_sb...
linux/mount.h: trim includes
uninline may_mount() and don't opencode it in fspick(2)/fsopen(2)
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/usermode_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/usermode_driver.c b/kernel/usermode_driver.c index 9dae1f648713..8303f4c7ca71 100644 --- a/kernel/usermode_driver.c +++ b/kernel/usermode_driver.c @@ -28,7 +28,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *na file = file_open_root_mnt(mnt, name, O_CREAT | O_WRONLY, 0700); if (IS_ERR(file)) { - mntput(mnt); + kern_unmount(mnt); return ERR_CAST(file); } @@ -38,7 +38,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *na if (err >= 0) err = -ENOMEM; filp_close(file, NULL); - mntput(mnt); + kern_unmount(mnt); return ERR_PTR(err); } |