Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Shuah Khan <skhan@linuxfoundation.org>
To: viro@zeniv.linux.org.uk, axboe@kernel.dk,
zohar@linux.vnet.ibm.com, mcgrof@kernel.org,
keescook@chromium.org
Cc: Shuah Khan <skhan@linuxfoundation.org>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] fs: avoid fdput() after failed fdget() in ksys_sync_file_range()
Date: Thu, 7 May 2020 17:57:09 -0600 [thread overview]
Message-ID: <31be6e0896eba59c06eb9d3d137b214f7220cc53.1588894359.git.skhan@linuxfoundation.org> (raw)
In-Reply-To: <cover.1588894359.git.skhan@linuxfoundation.org>
Fix ksys_sync_file_range() to avoid fdput() after a failed fdget().
fdput() doesn't do fput() on this file since FDPUT_FPUT isn't set
in fd.flags. Fix it anyway since failed fdget() doesn't require
a fdput().
This was introdcued in a commit to add sync_file_range() helper.
Fixes: 22f96b3808c1 ("fs: add sync_file_range() helper")
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
fs/sync.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/sync.c b/fs/sync.c
index 4d1ff010bc5a..faaff835ef12 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -369,10 +369,11 @@ int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
ret = -EBADF;
f = fdget(fd);
- if (f.file)
+ if (f.file) {
ret = sync_file_range(f.file, offset, nbytes, flags);
+ fdput(f);
+ }
- fdput(f);
return ret;
}
--
2.20.1
next prev parent reply other threads:[~2020-05-07 23:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 23:57 [PATCH 0/2] fs: avoid fdput() after failed fdget() Shuah Khan
2020-05-07 23:57 ` Shuah Khan [this message]
2020-05-08 0:05 ` [PATCH 1/2] fs: avoid fdput() after failed fdget() in ksys_sync_file_range() Al Viro
2020-05-08 0:24 ` Al Viro
2020-05-08 2:21 ` Luis Chamberlain
2020-05-08 15:07 ` Shuah Khan
2020-05-07 23:57 ` [PATCH 2/2] fs: avoid fdput() after failed fdget() in kernel_read_file_from_fd() Shuah Khan
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=31be6e0896eba59c06eb9d3d137b214f7220cc53.1588894359.git.skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=axboe@kernel.dk \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zohar@linux.vnet.ibm.com \
--subject='Re: [PATCH 1/2] fs: avoid fdput() after failed fdget() in ksys_sync_file_range()' \
/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
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 NNTP newsgroup(s).