2018-03-13 11:35:41

by sunqiuyang

Subject: [PATCH 1/1] f2fs: release locks before return in f2fs_ioc_gc_range()

From: Qiuyang Sun <[email protected]>

Currently, we will leave the kernel with locks still held when the gc_range
is invalid. This patch fixes the bug.

Signed-off-by: Qiuyang Sun <[email protected]>
---
fs/f2fs/file.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index c4c27e6..ee88058 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2059,8 +2059,10 @@ static int f2fs_ioc_gc_range(struct file *filp, unsigned long arg)
return ret;

end = range.start + range.len;
- if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi))
- return -EINVAL;
+ if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi)) {
+ ret = -EINVAL;
+ goto out;
+ }
do_more:
if (!range.sync) {
if (!mutex_trylock(&sbi->gc_mutex)) {
--
2.5.0

2018-03-16 08:22:56

by Chao Yu

Subject: Re: [PATCH 1/1] f2fs: release locks before return in f2fs_ioc_gc_range()

On 2018/3/13 19:42, sunqiuyang wrote:
> From: Qiuyang Sun <[email protected]>
>
> Currently, we will leave the kernel with locks still held when the gc_range
> is invalid. This patch fixes the bug.
>
> Signed-off-by: Qiuyang Sun <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,