diff --git a/[refs] b/[refs]
index c03183daf368..4bda4b413c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d44651d0f922b7aaeddd9fc04f2f5700a65983dd
+refs/heads/master: f472e02669073e4f1a388142bafa0f806fae841c
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index f473ddf0bd94..5c4861210d4c 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -779,6 +779,11 @@ static int ext4_ext_insert_index(handle_t *handle, struct inode *inode,
 		ix = curp->p_idx;
 	}
 
+	if (unlikely(ix > EXT_MAX_INDEX(curp->p_hdr))) {
+		EXT4_ERROR_INODE(inode, "ix > EXT_MAX_INDEX!");
+		return -EIO;
+	}
+
 	ix->ei_block = cpu_to_le32(logical);
 	ext4_idx_store_pblock(ix, ptr);
 	le16_add_cpu(&curp->p_hdr->eh_entries, 1);