1 files changed, 10 insertions, 3 deletions

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 057362a821a0..a6960b47f394 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -454,7 +454,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
                         new_blkaddr == NULL_ADDR);
         f2fs_bug_on(sbi, nat_get_blkaddr(e) == NEW_ADDR &&
                         new_blkaddr == NEW_ADDR);
-        f2fs_bug_on(sbi, is_valid_data_blkaddr(sbi, nat_get_blkaddr(e)) &&
+        f2fs_bug_on(sbi, __is_valid_data_blkaddr(nat_get_blkaddr(e)) &&
                         new_blkaddr == NEW_ADDR);
 
         /* increment version no as node is removed */
@@ -465,7 +465,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
 
         /* change address */
         nat_set_blkaddr(e, new_blkaddr);
-        if (!is_valid_data_blkaddr(sbi, new_blkaddr))
+        if (!__is_valid_data_blkaddr(new_blkaddr))
                 set_nat_flag(e, IS_CHECKPOINTED, false);
         __set_nat_cache_dirty(nm_i, e);
 
@@ -526,6 +526,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
         struct f2fs_nat_entry ne;
         struct nat_entry *e;
         pgoff_t index;
+        block_t blkaddr;
         int i;
 
         ni->nid = nid;
@@ -569,6 +570,11 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
         node_info_from_raw_nat(ni, &ne);
         f2fs_put_page(page, 1);
 cache:
+        blkaddr = le32_to_cpu(ne.block_addr);
+        if (__is_valid_data_blkaddr(blkaddr) &&
+                !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE))
+                return -EFAULT;
+
         /* cache nat entry */
         cache_nat_entry(sbi, nid, &ne);
         return 0;
@@ -1548,7 +1554,8 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,
         }
 
         if (__is_valid_data_blkaddr(ni.blk_addr) &&
-                !f2fs_is_valid_blkaddr(sbi, ni.blk_addr, DATA_GENERIC)) {
+                !f2fs_is_valid_blkaddr(sbi, ni.blk_addr,
+                                        DATA_GENERIC_ENHANCE)) {
                 up_read(&sbi->node_write);
                 goto redirty_out;
         }