2 files changed, 9 insertions, 4 deletions

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 84a47b709f51..acaef57e3606 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -393,6 +393,13 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
         if (!sbi->rsrc_clump_blocks)
                 sbi->rsrc_clump_blocks = 1;
 
+        err = generic_check_addressable(sbi->alloc_blksz_shift,
+                                        sbi->total_blocks);
+        if (err) {
+                printk(KERN_ERR "hfs: filesystem size too large.\n");
+                goto out_free_vhdr;
+        }
+
         /* Set up operations so we can load metadata */
         sb->s_op = &hfsplus_sops;
         sb->s_maxbytes = MAX_LFS_FILESIZE;
@@ -417,6 +424,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
                 sb->s_flags |= MS_RDONLY;
         }
 
+        err = -EINVAL;
+
         /* Load metadata objects (B*Trees) */
         sbi->ext_tree = hfs_btree_open(sb, HFSPLUS_EXT_CNID);
         if (!sbi->ext_tree) {
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c
index 4b86468125c1..2f933e83f5c5 100644
--- a/fs/hfsplus/wrapper.c
+++ b/fs/hfsplus/wrapper.c
@@ -141,10 +141,6 @@ int hfsplus_read_wrapper(struct super_block *sb)
 
         if (hfsplus_get_last_session(sb, &part_start, &part_size))
                 goto out;
-        if ((u64)part_start + part_size > 0x100000000ULL) {
-                pr_err("hfs: volumes larger than 2TB are not supported yet\n");
-                goto out;
-        }
 
         error = -ENOMEM;
         sbi->s_vhdr = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);