From: Aleksa Sarai <cyphar@cyphar.com>
To: Ian Kent <raven@themaw.net>, Bill O'Donnell <bodonnel@redhat.com>,
Christian Brauner <brauner@kernel.org>,
Jan Harkes <jaharkes@cs.cmu.edu>,
coda@cs.cmu.edu, Eric Sandeen <sandeen@redhat.com>,
David Howells <dhowells@redhat.com>
Cc: autofs@vger.kernel.org, linux-kernel@vger.kernel.org,
codalist@coda.cs.cmu.edu, Aleksa Sarai <cyphar@cyphar.com>
Subject: [PATCH v2 1/2] autofs: fix missing fput for FSCONFIG_SET_FD
Date: Wed, 31 Jul 2024 23:10:27 +1000 [thread overview]
Message-ID: <20240731-fsconfig-fsparam_fd-fixes-v2-1-e7c472224417@cyphar.com> (raw)
In-Reply-To: <20240731-fsconfig-fsparam_fd-fixes-v2-0-e7c472224417@cyphar.com>
If you pass an fd using FSCONFIG_SET_FD, autofs_parse_fd() "steals" the
param->file and so the fs_context infrastructure will not do fput() for
us.
Fixes: e6ec453bd0f0 ("autofs: convert autofs to use the new mount api")
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
fs/autofs/inode.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index cf792d4de4f1..64faa6c51f60 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -172,8 +172,7 @@ static int autofs_parse_fd(struct fs_context *fc, struct autofs_sb_info *sbi,
ret = autofs_check_pipe(pipe);
if (ret < 0) {
errorf(fc, "Invalid/unusable pipe");
- if (param->type != fs_value_is_file)
- fput(pipe);
+ fput(pipe);
return -EBADF;
}
--
2.45.2
next prev parent reply other threads:[~2024-07-31 13:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 13:10 [PATCH v2 0/2] fsconfig: minor fsparam_fd fixes Aleksa Sarai
2024-07-31 13:10 ` Aleksa Sarai [this message]
2024-07-31 13:10 ` [PATCH v2 2/2] coda: use param->file for FSCONFIG_SET_FD Aleksa Sarai
2024-08-01 7:04 ` [PATCH v2 0/2] fsconfig: minor fsparam_fd fixes Christian Brauner
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=20240731-fsconfig-fsparam_fd-fixes-v2-1-e7c472224417@cyphar.com \
--to=cyphar@cyphar.com \
--cc=autofs@vger.kernel.org \
--cc=bodonnel@redhat.com \
--cc=brauner@kernel.org \
--cc=coda@cs.cmu.edu \
--cc=codalist@coda.cs.cmu.edu \
--cc=dhowells@redhat.com \
--cc=jaharkes@cs.cmu.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=raven@themaw.net \
--cc=sandeen@redhat.com \
/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
all inboxes | Powered by JetHome®