diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 36961c9b3163814ae843ba30bb5a3b6eb3b57b00..f73c9e5ea936428959d1760f086fe367c2966b1e 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -812,7 +812,8 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
 
 		/* check memory boundary before moving forward */
 		bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
-		if (unlikely(bit_pos > d->max)) {
+		if (unlikely(bit_pos > d->max ||
+				le16_to_cpu(de->name_len) > F2FS_NAME_LEN)) {
 			f2fs_msg(sbi->sb, KERN_WARNING,
 				"%s: corrupted namelen=%d, run fsck to fix.",
 				__func__, le16_to_cpu(de->name_len));