1 files changed, 6 insertions, 0 deletions

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 0b9688683526..7643d52c776c 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1384,6 +1384,12 @@ retry:
                 bh = ext4_getblk(handle, ea_inode, block, 0);
                 if (IS_ERR(bh))
                         return PTR_ERR(bh);
+                if (!bh) {
+                        WARN_ON_ONCE(1);
+                        EXT4_ERROR_INODE(ea_inode,
+                                         "ext4_getblk() return bh = NULL");
+                        return -EFSCORRUPTED;
+                }
                 ret = ext4_journal_get_write_access(handle, bh);
                 if (ret)
                         goto out;