Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 11 insertions, 1 deletions

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index c3e74f9128e8..f48ffd7a8d3e 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -471,8 +471,18 @@ xfs_vn_get_link_inline(
         struct inode            *inode,
         struct delayed_call     *done)
 {
+        char                    *link;
+
         ASSERT(XFS_I(inode)->i_df.if_flags & XFS_IFINLINE);
-        return XFS_I(inode)->i_df.if_u1.if_data;
+
+        /*
+         * The VFS crashes on a NULL pointer, so return -EFSCORRUPTED if
+         * if_data is junk.
+         */
+        link = XFS_I(inode)->i_df.if_u1.if_data;
+        if (!link)
+                return ERR_PTR(-EFSCORRUPTED);
+        return link;
 }
 
 STATIC int