From: Ian Kent <raven@themaw.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
autofs mailing list <autofs@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 2/6] autofs - fix possible inode leak in autofs_fill_super()
Date: Tue, 13 Nov 2018 09:36:05 +0800 [thread overview]
Message-ID: <154207296462.11064.11496013579571371405.stgit@pluto-themaw-net> (raw)
In-Reply-To: <154207295533.11064.12485527860509413072.stgit@pluto-themaw-net>
There is no check at all for a failure to allocate the root inode
in autofs_fill_super(), handle it.
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs/inode.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 846c052569dd..e5c06b5a7371 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -254,9 +254,13 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
goto fail_free;
}
root_inode = autofs_get_inode(s, S_IFDIR | 0755);
+ if (!root_inode) {
+ ret = -ENOMEM;
+ goto fail_ino;
+ }
root = d_make_root(root_inode);
if (!root)
- goto fail_ino;
+ goto fail_iput;
pipe = NULL;
root->d_fsdata = ino;
@@ -304,8 +308,8 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
root_inode->i_op = &autofs_dir_inode_operations;
pr_debug("pipe fd = %d, pgrp = %u\n", pipefd, pid_nr(sbi->oz_pgrp));
- pipe = fget(pipefd);
+ pipe = fget(pipefd);
if (!pipe) {
pr_err("could not open pipe file descriptor\n");
goto fail_put_pid;
@@ -334,6 +338,8 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
fail_dput:
dput(root);
goto fail_free;
+fail_iput:
+ iput(root_inode);
fail_ino:
autofs_free_ino(ino);
fail_free:
next prev parent reply other threads:[~2018-11-13 1:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 1:35 [PATCH 1/6] autofs - improve ioctl sbi checks Ian Kent
2018-11-13 1:36 ` Ian Kent [this message]
2018-11-13 1:36 ` [PATCH 3/6] autofs - refactor super block info init Ian Kent
2018-11-13 1:36 ` [PATCH 4/6] autofs - use struct for mount params Ian Kent
2018-11-14 1:54 ` kbuild test robot
2018-11-14 5:56 ` Ian Kent
2018-11-13 1:36 ` [PATCH 5/6] autofs - change catatonic setting to a bit flag Ian Kent
2018-11-13 1:37 ` [PATCH 6/6] autofs - add strictexpire mount option Ian Kent
2018-11-15 13:26 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=154207296462.11064.11496013579571371405.stgit@pluto-themaw-net \
--to=raven@themaw.net \
--cc=akpm@linux-foundation.org \
--cc=autofs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).