fs/namespace: fix reference leak in grab_requested_mnt_ns
PATCH 1/1 fs/namespace: fix reference leak in grab_requested_mnt_ns
lookup_mnt_ns() already takes a reference on mnt_ns. grab_requested_mnt_ns() doesn't need to take an extra reference.
--- fs/namespace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/namespace.c +4 -3
@@ -5746,6 +5746,8 @@ static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreqif (kreq->mnt_ns_id) { mnt_ns =lookup_mnt_ns (kreq->mnt_ns_id); +if (!mnt_ns) +return ERR_PTR (-ENOENT ); }else if (kreq->mnt_ns_fd) {struct ns_common *ns;
@@ -5761,13 +5763,12 @@ static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreqreturn ERR_PTR (-EINVAL ); mnt_ns =to_mnt_ns (ns); +refcount_inc (&mnt_ns->passive); }else { mnt_ns = current->nsproxy->mnt_ns; +refcount_inc (&mnt_ns->passive); } -if (!mnt_ns) -return ERR_PTR (-ENOENT ); -refcount_inc (&mnt_ns->passive);return mnt_ns; }
Signature · 1 line
2.52.0.487.g5c8c507ade-goog
Quoted 4 lines · Andrei Vagin
lookup_mnt_ns()already takes a reference onmnt_ns.grab_requested_mnt_ns()doesn't need to take an extra reference.
Applied to the vfs.fixes branch of the vfs/vfs.git tree. Patches in the vfs.fixes branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.fixes
[1/1] fs/namespace: fix reference leak in grab_requested_mnt_ns
https://git.kernel.org/vfs/vfs/c/7b6dcd9bfd86