1 files changed, 152 insertions, 109 deletions

diff --git a/fs/udf/super.c b/fs/udf/super.c
index a14346137361..8c28e93e9b73 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -92,10 +92,6 @@ static void udf_put_super(struct super_block *);
 static int udf_sync_fs(struct super_block *, int);
 static int udf_remount_fs(struct super_block *, int *, char *);
 static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad);
-static int udf_find_fileset(struct super_block *, struct kernel_lb_addr *,
-                            struct kernel_lb_addr *);
-static void udf_load_fileset(struct super_block *, struct buffer_head *,
-                             struct kernel_lb_addr *);
 static void udf_open_lvid(struct super_block *);
 static void udf_close_lvid(struct super_block *);
 static unsigned int udf_count_free(struct super_block *);
@@ -151,9 +147,11 @@ static struct inode *udf_alloc_inode(struct super_block *sb)
 
         ei->i_unique = 0;
         ei->i_lenExtents = 0;
+        ei->i_lenStreams = 0;
         ei->i_next_alloc_block = 0;
         ei->i_next_alloc_goal = 0;
         ei->i_strat4096 = 0;
+        ei->i_streamdir = 0;
         init_rwsem(&ei->i_data_sem);
         ei->cached_extent.lstart = -1;
         spin_lock_init(&ei->i_extent_cache_lock);
@@ -271,8 +269,7 @@ static void udf_sb_free_bitmap(struct udf_bitmap *bitmap)
         int nr_groups = bitmap->s_nr_groups;
 
         for (i = 0; i < nr_groups; i++)
-                if (bitmap->s_block_bitmap[i])
-                        brelse(bitmap->s_block_bitmap[i]);
+                brelse(bitmap->s_block_bitmap[i]);
 
         kvfree(bitmap);
 }
@@ -646,16 +643,67 @@ out_unlock:
         return error;
 }
 
-/* Check Volume Structure Descriptors (ECMA 167 2/9.1) */
-/* We also check any "CD-ROM Volume Descriptor Set" (ECMA 167 2/8.3.1) */
-static loff_t udf_check_vsd(struct super_block *sb)
+/*
+ * Check VSD descriptor. Returns -1 in case we are at the end of volume
+ * recognition area, 0 if the descriptor is valid but non-interesting, 1 if
+ * we found one of NSR descriptors we are looking for.
+ */
+static int identify_vsd(const struct volStructDesc *vsd)
+{
+        int ret = 0;
+
+        if (!memcmp(vsd->stdIdent, VSD_STD_ID_CD001, VSD_STD_ID_LEN)) {
+                switch (vsd->structType) {
+                case 0:
+                        udf_debug("ISO9660 Boot Record found\n");
+                        break;
+                case 1:
+                        udf_debug("ISO9660 Primary Volume Descriptor found\n");
+                        break;
+                case 2:
+                        udf_debug("ISO9660 Supplementary Volume Descriptor found\n");
+                        break;
+                case 3:
+                        udf_debug("ISO9660 Volume Partition Descriptor found\n");
+                        break;
+                case 255:
+                        udf_debug("ISO9660 Volume Descriptor Set Terminator found\n");
+                        break;
+                default:
+                        udf_debug("ISO9660 VRS (%u) found\n", vsd->structType);
+                        break;
+                }
+        } else if (!memcmp(vsd->stdIdent, VSD_STD_ID_BEA01, VSD_STD_ID_LEN))
+                ; /* ret = 0 */
+        else if (!memcmp(vsd->stdIdent, VSD_STD_ID_NSR02, VSD_STD_ID_LEN))
+                ret = 1;
+        else if (!memcmp(vsd->stdIdent, VSD_STD_ID_NSR03, VSD_STD_ID_LEN))
+                ret = 1;
+        else if (!memcmp(vsd->stdIdent, VSD_STD_ID_BOOT2, VSD_STD_ID_LEN))
+                ; /* ret = 0 */
+        else if (!memcmp(vsd->stdIdent, VSD_STD_ID_CDW02, VSD_STD_ID_LEN))
+                ; /* ret = 0 */
+        else {
+                /* TEA01 or invalid id : end of volume recognition area */
+                ret = -1;
+        }
+
+        return ret;
+}
+
+/*
+ * Check Volume Structure Descriptors (ECMA 167 2/9.1)
+ * We also check any "CD-ROM Volume Descriptor Set" (ECMA 167 2/8.3.1)
+ * @return   1 if NSR02 or NSR03 found,
+ *          -1 if first sector read error, 0 otherwise
+ */
+static int udf_check_vsd(struct super_block *sb)
 {
         struct volStructDesc *vsd = NULL;
         loff_t sector = VSD_FIRST_SECTOR_OFFSET;
         int sectorsize;
         struct buffer_head *bh = NULL;
-        int nsr02 = 0;
-        int nsr03 = 0;
+        int nsr = 0;
         struct udf_sb_info *sbi;
 
         sbi = UDF_SB(sb);
@@ -679,71 +727,36 @@ static loff_t udf_check_vsd(struct super_block *sb)
          * activity. This actually happened with uninitialised SSD partitions
          * (all 0xFF) before the check for the limit and all valid IDs were
          * added */
-        for (; !nsr02 && !nsr03 && sector < VSD_MAX_SECTOR_OFFSET;
-             sector += sectorsize) {
+        for (; !nsr && sector < VSD_MAX_SECTOR_OFFSET; sector += sectorsize) {
                 /* Read a block */
                 bh = udf_tread(sb, sector >> sb->s_blocksize_bits);
                 if (!bh)
                         break;
 
-                /* Look for ISO  descriptors */
                 vsd = (struct volStructDesc *)(bh->b_data +
                                               (sector & (sb->s_blocksize - 1)));
-
-                if (!strncmp(vsd->stdIdent, VSD_STD_ID_CD001,
-                                    VSD_STD_ID_LEN)) {
-                        switch (vsd->structType) {
-                        case 0:
-                                udf_debug("ISO9660 Boot Record found\n");
-                                break;
-                        case 1:
-                                udf_debug("ISO9660 Primary Volume Descriptor found\n");
-                                break;
-                        case 2:
-                                udf_debug("ISO9660 Supplementary Volume Descriptor found\n");
-                                break;
-                        case 3:
-                                udf_debug("ISO9660 Volume Partition Descriptor found\n");
-                                break;
-                        case 255:
-                                udf_debug("ISO9660 Volume Descriptor Set Terminator found\n");
-                                break;
-                        default:
-                                udf_debug("ISO9660 VRS (%u) found\n",
-                                          vsd->structType);
-                                break;
-                        }
-                } else if (!strncmp(vsd->stdIdent, VSD_STD_ID_BEA01,
-                                    VSD_STD_ID_LEN))
-                        ; /* nothing */
-                else if (!strncmp(vsd->stdIdent, VSD_STD_ID_TEA01,
-                                    VSD_STD_ID_LEN)) {
-                        brelse(bh);
-                        break;
-                } else if (!strncmp(vsd->stdIdent, VSD_STD_ID_NSR02,
-                                    VSD_STD_ID_LEN))
-                        nsr02 = sector;
-                else if (!strncmp(vsd->stdIdent, VSD_STD_ID_NSR03,
-                                    VSD_STD_ID_LEN))
-                        nsr03 = sector;
-                else if (!strncmp(vsd->stdIdent, VSD_STD_ID_BOOT2,
-                                    VSD_STD_ID_LEN))
-                        ; /* nothing */
-                else if (!strncmp(vsd->stdIdent, VSD_STD_ID_CDW02,
-                                    VSD_STD_ID_LEN))
-                        ; /* nothing */
-                else {
-                        /* invalid id : end of volume recognition area */
+                nsr = identify_vsd(vsd);
+                /* Found NSR or end? */
+                if (nsr) {
                         brelse(bh);
                         break;
                 }
+                /*
+                 * Special handling for improperly formatted VRS (e.g., Win10)
+                 * where components are separated by 2048 bytes even though
+                 * sectors are 4K
+                 */
+                if (sb->s_blocksize == 4096) {
+                        nsr = identify_vsd(vsd + 1);
+                        /* Ignore unknown IDs... */
+                        if (nsr < 0)
+                                nsr = 0;
+                }
                 brelse(bh);
         }
 
-        if (nsr03)
-                return nsr03;
-        else if (nsr02)
-                return nsr02;
+        if (nsr > 0)
+                return 1;
         else if (!bh && sector - (sbi->s_session << sb->s_blocksize_bits) ==
                         VSD_FIRST_SECTOR_OFFSET)
                 return -1;
@@ -751,34 +764,82 @@ static loff_t udf_check_vsd(struct super_block *sb)
                 return 0;
 }
 
+static int udf_verify_domain_identifier(struct super_block *sb,
+                                        struct regid *ident, char *dname)
+{
+        struct domainEntityIDSuffix *suffix;
+
+        if (memcmp(ident->ident, UDF_ID_COMPLIANT, strlen(UDF_ID_COMPLIANT))) {
+                udf_warn(sb, "Not OSTA UDF compliant %s descriptor.\n", dname);
+                goto force_ro;
+        }
+        if (ident->flags & (1 << ENTITYID_FLAGS_DIRTY)) {
+                udf_warn(sb, "Possibly not OSTA UDF compliant %s descriptor.\n",
+                         dname);
+                goto force_ro;
+        }
+        suffix = (struct domainEntityIDSuffix *)ident->identSuffix;
+        if (suffix->flags & (1 << ENTITYIDSUFFIX_FLAGS_HARDWRITEPROTECT) ||
+            suffix->flags & (1 << ENTITYIDSUFFIX_FLAGS_SOFTWRITEPROTECT)) {
+                if (!sb_rdonly(sb)) {
+                        udf_warn(sb, "Descriptor for %s marked write protected."
+                                 " Forcing read only mount.\n", dname);
+                }
+                goto force_ro;
+        }
+        return 0;
+
+force_ro:
+        if (!sb_rdonly(sb))
+                return -EACCES;
+        UDF_SET_FLAG(sb, UDF_FLAG_RW_INCOMPAT);
+        return 0;
+}
+
+static int udf_load_fileset(struct super_block *sb, struct fileSetDesc *fset,
+                            struct kernel_lb_addr *root)
+{
+        int ret;
+
+        ret = udf_verify_domain_identifier(sb, &fset->domainIdent, "file set");
+        if (ret < 0)
+                return ret;
+
+        *root = lelb_to_cpu(fset->rootDirectoryICB.extLocation);
+        UDF_SB(sb)->s_serial_number = le16_to_cpu(fset->descTag.tagSerialNum);
+
+        udf_debug("Rootdir at block=%u, partition=%u\n",
+                  root->logicalBlockNum, root->partitionReferenceNum);
+        return 0;
+}
+
 static int udf_find_fileset(struct super_block *sb,
                             struct kernel_lb_addr *fileset,
                             struct kernel_lb_addr *root)
 {
         struct buffer_head *bh = NULL;
         uint16_t ident;
+        int ret;
 
-        if (fileset->logicalBlockNum != 0xFFFFFFFF ||
-            fileset->partitionReferenceNum != 0xFFFF) {
-                bh = udf_read_ptagged(sb, fileset, 0, &ident);
-
-                if (!bh) {
-                        return 1;
-                } else if (ident != TAG_IDENT_FSD) {
-                        brelse(bh);
-                        return 1;
-                }
-
-                udf_debug("Fileset at block=%u, partition=%u\n",
-                          fileset->logicalBlockNum,
-                          fileset->partitionReferenceNum);
+        if (fileset->logicalBlockNum == 0xFFFFFFFF &&
+            fileset->partitionReferenceNum == 0xFFFF)
+                return -EINVAL;
 
-                UDF_SB(sb)->s_partition = fileset->partitionReferenceNum;
-                udf_load_fileset(sb, bh, root);
+        bh = udf_read_ptagged(sb, fileset, 0, &ident);
+        if (!bh)
+                return -EIO;
+        if (ident != TAG_IDENT_FSD) {
                 brelse(bh);
-                return 0;
+                return -EINVAL;
         }
-        return 1;
+
+        udf_debug("Fileset at block=%u, partition=%u\n",
+                  fileset->logicalBlockNum, fileset->partitionReferenceNum);
+
+        UDF_SB(sb)->s_partition = fileset->partitionReferenceNum;
+        ret = udf_load_fileset(sb, (struct fileSetDesc *)bh->b_data, root);
+        brelse(bh);
+        return ret;
 }
 
 /*
@@ -794,9 +855,7 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block)
         struct buffer_head *bh;
         uint16_t ident;
         int ret = -ENOMEM;
-#ifdef UDFFS_DEBUG
         struct timestamp *ts;
-#endif
 
         outstr = kmalloc(128, GFP_NOFS);
         if (!outstr)
@@ -817,13 +876,10 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block)
 
         udf_disk_stamp_to_time(&UDF_SB(sb)->s_record_time,
                               pvoldesc->recordingDateAndTime);
-#ifdef UDFFS_DEBUG
         ts = &pvoldesc->recordingDateAndTime;
         udf_debug("recording time %04u/%02u/%02u %02u:%02u (%x)\n",
                   le16_to_cpu(ts->year), ts->month, ts->day, ts->hour,
                   ts->minute, le16_to_cpu(ts->typeAndTimezone));
-#endif
-
 
         ret = udf_dstrCS0toChar(sb, outstr, 31, pvoldesc->volIdent, 32);
         if (ret < 0) {
@@ -939,21 +995,6 @@ static int udf_load_metadata_files(struct super_block *sb, int partition,
         return 0;
 }
 
-static void udf_load_fileset(struct super_block *sb, struct buffer_head *bh,
-                             struct kernel_lb_addr *root)
-{
-        struct fileSetDesc *fset;
-
-        fset = (struct fileSetDesc *)bh->b_data;
-
-        *root = lelb_to_cpu(fset->rootDirectoryICB.extLocation);
-
-        UDF_SB(sb)->s_serial_number = le16_to_cpu(fset->descTag.tagSerialNum);
-
-        udf_debug("Rootdir at block=%u, partition=%u\n",
-                  root->logicalBlockNum, root->partitionReferenceNum);
-}
-
 int udf_compute_nr_groups(struct super_block *sb, u32 partition)
 {
         struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[partition];
@@ -1238,9 +1279,7 @@ static int udf_load_partdesc(struct super_block *sb, sector_t block)
          * PHYSICAL partitions are already set up
          */
         type1_idx = i;
-#ifdef UDFFS_DEBUG
         map = NULL; /* supress 'maybe used uninitialized' warning */
-#endif
         for (i = 0; i < sbi->s_partitions; i++) {
                 map = &sbi->s_partmaps[i];
 
@@ -1364,6 +1403,10 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
                 goto out_bh;
         }
 
+        ret = udf_verify_domain_identifier(sb, &lvd->domainIdent,
+                                           "logical volume");
+        if (ret)
+                goto out_bh;
         ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
         if (ret)
                 goto out_bh;
@@ -1915,7 +1958,7 @@ static int udf_load_vrs(struct super_block *sb, struct udf_options *uopt,
                         int silent, struct kernel_lb_addr *fileset)
 {
         struct udf_sb_info *sbi = UDF_SB(sb);
-        loff_t nsr_off;
+        int nsr = 0;
         int ret;
 
         if (!sb_set_blocksize(sb, uopt->blocksize)) {
@@ -1926,13 +1969,13 @@ static int udf_load_vrs(struct super_block *sb, struct udf_options *uopt,
         sbi->s_last_block = uopt->lastblock;
         if (!uopt->novrs) {
                 /* Check that it is NSR02 compliant */
-                nsr_off = udf_check_vsd(sb);
-                if (!nsr_off) {
+                nsr = udf_check_vsd(sb);
+                if (!nsr) {
                         if (!silent)
                                 udf_warn(sb, "No VRS found\n");
                         return -EINVAL;
                 }
-                if (nsr_off == -1)
+                if (nsr == -1)
                         udf_debug("Failed to read sector at offset %d. "
                                   "Assuming open disc. Skipping validity "
                                   "check\n", VSD_FIRST_SECTOR_OFFSET);
@@ -2216,9 +2259,9 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
                 UDF_SET_FLAG(sb, UDF_FLAG_RW_INCOMPAT);
         }
 
-        if (udf_find_fileset(sb, &fileset, &rootdir)) {
+        ret = udf_find_fileset(sb, &fileset, &rootdir);
+        if (ret < 0) {
                 udf_warn(sb, "No fileset found\n");
-                ret = -EINVAL;
                 goto error_out;
         }