From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: He YunLei <heyunlei@huawei.com>
Subject: Re: [PATCH v2 7/7] f2fs: should check the remaining dentry bits
Date: Mon, 25 Apr 2016 19:53:06 -0700 [thread overview]
Message-ID: <20160426025306.GA18242@jaegeuk.gateway> (raw)
In-Reply-To: <1461629220-16280-7-git-send-email-jaegeuk@kernel.org>
Change log from v1:
o remove wron f2fs_bug_on()
>From 545c0c9055b0d8dc5d134d9340b3cd80eeecdafa Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Mon, 25 Apr 2016 14:24:44 -0700
Subject: [PATCH] f2fs: should check the remaining dentry bits
Let's consider a race condition between f2fs_add_regular_entry and
find_target_dentry.
1.
- f2fs_add_regular_entry updated len: 24 first.
|
Bits: 0 0 0 1
Lens: 24 0 0 3 (name: foo)
|->
- find_target_dentry checks the first bit to find "foo", then ++pointer.
2.
- f2fs_add_regular_entry updates bits.
|>|>|
Bits: 1 1 1 1
Lens: 24 0 0 3 (name: foo)
|
- find_target_dentry is checking second bit, but it's len is zero, which
makes the process being terminated.
In this case, user can add additional dentry named "foo" accordingly.
This patch enables to check the remaining bits.
Signed-off-by: He YunLei <heyunlei@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/dir.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index e90380d..0ad7b9a 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -100,12 +100,6 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page,
*res_page = dentry_page;
else
kunmap(dentry_page);
-
- /*
- * For the most part, it should be a bug when name_len is zero.
- * We stop here for figuring out where the bugs has occurred.
- */
- f2fs_bug_on(F2FS_P_SB(dentry_page), d.max < 0);
return de;
}
@@ -149,9 +143,9 @@ struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *fname,
/* remain bug on condition */
if (unlikely(!de->name_len))
- d->max = -1;
-
- bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
+ bit_pos++;
+ else
+ bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
}
de = NULL;
--
2.6.3
next prev parent reply other threads:[~2016-04-26 2:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 0:06 [PATCH 1/7] f2fs: avoid needless lock for node pages when fsyncing a file Jaegeuk Kim
2016-04-26 0:06 ` [PATCH 2/7] f2fs: avoid writing 0'th page in volatile writes Jaegeuk Kim
2016-04-26 0:06 ` [PATCH 3/7] f2fs: split sync_node_pages with fsync_node_pages Jaegeuk Kim
2016-04-26 0:06 ` [PATCH 4/7] f2fs: report unwritten status in fsync_node_pages Jaegeuk Kim
2016-04-26 0:06 ` [PATCH 5/7] f2fs: set fsync mark only for the last dnode Jaegeuk Kim
2016-04-26 0:06 ` [PATCH 6/7] f2fs: issue cache flush on direct IO Jaegeuk Kim
2016-04-26 0:07 ` [PATCH 7/7] f2fs: should check the remaining dentry bits Jaegeuk Kim
2016-04-26 2:53 ` Jaegeuk Kim [this message]
2016-04-27 14:22 ` [f2fs-dev] " Chao Yu
2016-04-27 17:40 ` Jaegeuk Kim
2016-04-26 12:51 ` [f2fs-dev] [PATCH 1/7] f2fs: avoid needless lock for node pages when fsyncing a file Chao Yu
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=20160426025306.GA18242@jaegeuk.gateway \
--to=jaegeuk@kernel.org \
--cc=heyunlei@huawei.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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 NNTP newsgroup(s).