X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=d23b6b0731020e4d75b014749183142f0ad79250;hp=da0be2885b47ae159577fd353bcf2494a6f0eb9e;hb=4d9742676317b6c0d62739bc7167ea70adf95440;hpb=4d9794d1f1a6044c261faae0968af1b2c0480f4b diff --git a/src/metadata_resource.c b/src/metadata_resource.c index da0be288..d23b6b07 100644 --- a/src/metadata_resource.c +++ b/src/metadata_resource.c @@ -52,14 +52,16 @@ * Returns: Zero on success, nonzero on failure. */ int -read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd) +read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd) { u8 *buf; - u32 dentry_offset; int ret; - struct wim_dentry *dentry; + struct wim_dentry *root; const struct wim_lookup_table_entry *metadata_lte; u64 metadata_len; + u8 hash[SHA1_HASH_SIZE]; + struct wim_security_data *security_data; + struct wim_inode *inode; metadata_lte = imd->metadata_lte; metadata_len = wim_resource_size(metadata_lte); @@ -73,7 +75,7 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd) /* There is no way the metadata resource could possibly be less than (8 * + WIM_DENTRY_DISK_SIZE) bytes, where the 8 is for security data (with * no security descriptors) and WIM_DENTRY_DISK_SIZE is for the root - * dentry. */ + * entry. */ if (metadata_len < 8 + WIM_DENTRY_DISK_SIZE) { ERROR("Expected at least %u bytes for the metadata resource", 8 + WIM_DENTRY_DISK_SIZE); @@ -100,6 +102,13 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd) if (ret) goto out_free_buf; + sha1_buffer(buf, metadata_len, hash); + if (!hashes_equal(metadata_lte->hash, hash)) { + ERROR("Metadata resource is corrupted (invalid SHA-1 message digest)!"); + ret = WIMLIB_ERR_INVALID_RESOURCE_HASH; + goto out_free_buf; + } + DEBUG("Finished reading metadata resource into memory."); /* The root directory entry starts after security data, aligned on an @@ -110,79 +119,83 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd) * the offset of the root dentry. * * Here we read the security data into a wim_security_data structure, - * and if successful, go ahead and calculate the offset in the metadata - * resource of the root dentry. */ + * which takes case of rouding total_length. If successful, go ahead + * and calculate the offset in the metadata resource of the root dentry. + * */ - wimlib_assert(imd->security_data == NULL); - ret = read_wim_security_data(buf, metadata_len, &imd->security_data); + ret = read_wim_security_data(buf, metadata_len, &security_data); if (ret) goto out_free_buf; - dentry_offset = (imd->security_data->total_length + 7) & ~7; - - if (dentry_offset == 0) { - ERROR("Integer overflow while reading metadata resource"); - ret = WIMLIB_ERR_INVALID_SECURITY_DATA; - goto out_free_security_data; - } - DEBUG("Reading root dentry"); /* Allocate memory for the root dentry and read it into memory */ - dentry = MALLOC(sizeof(struct wim_dentry)); - if (!dentry) { - ERROR("Failed to allocate %zu bytes for root dentry", - sizeof(struct wim_dentry)); + root = MALLOC(sizeof(struct wim_dentry)); + if (!root) { ret = WIMLIB_ERR_NOMEM; goto out_free_security_data; } - ret = read_dentry(buf, metadata_len, dentry_offset, dentry); + ret = read_dentry(buf, metadata_len, + security_data->total_length, root); - /* This is the root dentry, so set its parent to itself. */ - dentry->parent = dentry; - - if (ret == 0 && dentry->length == 0) { - ERROR("Metadata resource cannot begin with end-of-directory entry!"); - ret = WIMLIB_ERR_INVALID_DENTRY; + if (ret == 0 && root->length == 0) { + WARNING("Metadata resource begins with end-of-directory entry " + "(treating as empty image)"); + FREE(root); + root = NULL; + goto out_success; } - if (ret != 0) { - FREE(dentry); + if (ret) { + FREE(root); goto out_free_security_data; } - inode_add_dentry(dentry, dentry->d_inode); + if (dentry_has_long_name(root) || dentry_has_short_name(root)) { + WARNING("The root directory has a nonempty name (removing it)"); + FREE(root->file_name); + FREE(root->short_name); + root->file_name = NULL; + root->short_name = NULL; + root->file_name_nbytes = 0; + root->short_name_nbytes = 0; + } + + /* This is the root dentry, so set its parent to itself. */ + root->parent = root; + + inode_add_dentry(root, root->d_inode); /* Now read the entire directory entry tree into memory. */ DEBUG("Reading dentry tree"); - ret = read_dentry_tree(buf, metadata_len, dentry); + ret = read_dentry_tree(buf, metadata_len, root); if (ret) goto out_free_dentry_tree; /* Build hash table that maps hard link group IDs to dentry sets */ - ret = dentry_tree_fix_inodes(dentry, &imd->inode_list); + ret = dentry_tree_fix_inodes(root, &imd->inode_list); if (ret) goto out_free_dentry_tree; - if (!w->all_images_verified) { - DEBUG("Running miscellaneous verifications on the dentry tree"); - for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL); - ret = for_dentry_in_tree(dentry, verify_dentry, w); + + DEBUG("Running miscellaneous verifications on the dentry tree"); + image_for_each_inode(inode, imd) { + ret = verify_inode(inode, security_data); if (ret) goto out_free_dentry_tree; } - DEBUG("Done reading image metadata"); - - imd->root_dentry = dentry; +out_success: + imd->root_dentry = root; + imd->security_data = security_data; INIT_LIST_HEAD(&imd->unhashed_streams); + ret = 0; goto out_free_buf; out_free_dentry_tree: - free_dentry_tree(dentry, NULL); + free_dentry_tree(root, wim->lookup_table); out_free_security_data: - free_wim_security_data(imd->security_data); - imd->security_data = NULL; + free_wim_security_data(security_data); out_free_buf: FREE(buf); return ret; @@ -298,7 +311,7 @@ write_metadata_resource(WIMStruct *w) * is updated. */ ret = write_wim_resource_from_buffer(buf, metadata_original_size, w->out_fd, - wimlib_get_compression_type(w), + w->compression_type, <e->output_resource_entry, lte->hash); /* Note that although the SHA1 message digest of the metadata resource