X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=063834fbeda83aa879b4c41147aadb9484c01bf8;hp=6602832a94a4fe05ce2061c44baff5ed4be936e7;hb=5d3d469e410dc5f4a28814ad231336fc174cba56;hpb=1530b6dab02a9e1e5faf81529ab502aee68d8cd2 diff --git a/src/verify.c b/src/verify.c index 6602832a..063834fb 100644 --- a/src/verify.c +++ b/src/verify.c @@ -1,14 +1,11 @@ /* * verify.c * - * Some functions to verify that stuff in the WIM is valid. Of course, not - * *all* the verifications of the input data are in this file. + * Verify stream reference counts. */ /* - * Copyright (C) 2012 Eric Biggers - * - * wimlib - Library for working with WIM files + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -26,165 +23,59 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "dentry.h" -#include "lookup_table.h" - -static int verify_inode(struct wim_inode *inode, const WIMStruct *w) -{ - const struct wim_lookup_table *table = w->lookup_table; - const struct wim_security_data *sd = wim_const_security_data(w); - const struct wim_dentry *first_dentry = inode_first_dentry(inode); - int ret = WIMLIB_ERR_INVALID_DENTRY; - - /* Check the security ID */ - if (inode->i_security_id < -1) { - ERROR("Dentry `%s' has an invalid security ID (%d)", - first_dentry->full_path_utf8, inode->i_security_id); - goto out; - } - if (inode->i_security_id >= sd->num_entries) { - ERROR("Dentry `%s' has an invalid security ID (%d) " - "(there are only %u entries in the security table)", - first_dentry->full_path_utf8, inode->i_security_id, - sd->num_entries); - goto out; - } - - /* Check that lookup table entries for all the resources exist, except - * if the SHA1 message digest is all 0's, which indicates there is - * intentionally no resource there. */ - if (w->hdr.total_parts == 1) { - for (unsigned i = 0; i <= inode->i_num_ads; i++) { - struct wim_lookup_table_entry *lte; - const u8 *hash; - hash = inode_stream_hash_unresolved(inode, i); - lte = __lookup_resource(table, hash); - if (!lte && !is_zero_hash(hash)) { - ERROR("Could not find lookup table entry for stream " - "%u of dentry `%s'", i, first_dentry->full_path_utf8); - goto out; - } - if (lte) - lte->real_refcnt += inode->i_nlink; - - /* The following is now done when required by - * wim_run_full_verifications(). */ - - #if 0 - if (lte && !w->full_verification_in_progress && - lte->real_refcnt > lte->refcnt) - { - #ifdef ENABLE_ERROR_MESSAGES - WARNING("The following lookup table entry " - "has a reference count of %u, but", - lte->refcnt); - WARNING("We found %u references to it", - lte->real_refcnt); - WARNING("(One dentry referencing it is at `%s')", - first_dentry->full_path_utf8); - - print_lookup_table_entry(lte); - #endif - /* Guess what! install.wim for Windows 8 - * contains many streams referenced by more - * dentries than the refcnt stated in the lookup - * table entry. So we will need to handle this - * case and not just make it be an error... I'm - * just setting the reference count to the - * number of references we found. - * (Unfortunately, even after doing this, the - * reference count could be too low if it's also - * referenced in other WIM images) */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif - #if 1 - lte->refcnt = lte->real_refcnt; - WARNING("Fixing reference count"); - #else - goto out; - #endif - } - #endif - } - } +#include "wimlib/dentry.h" +#include "wimlib/error.h" +#include "wimlib/lookup_table.h" +#include "wimlib/metadata.h" +#include "wimlib/security.h" - /* Make sure there is only one un-named stream. */ - unsigned num_unnamed_streams = 0; - for (unsigned i = 0; i <= inode->i_num_ads; i++) { - const u8 *hash; - hash = inode_stream_hash_unresolved(inode, i); - if (inode_stream_name_len(inode, i) == 0 && !is_zero_hash(hash)) - num_unnamed_streams++; - } - if (num_unnamed_streams > 1) { - ERROR("Dentry `%s' has multiple (%u) un-named streams", - first_dentry->full_path_utf8, num_unnamed_streams); - goto out; - } - inode->i_verified = 1; - ret = 0; -out: - return ret; -} - -/* Run some miscellaneous verifications on a WIM dentry */ -int verify_dentry(struct wim_dentry *dentry, void *wim) +static int +lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr) { - int ret; - - if (!dentry->d_inode->i_verified) { - ret = verify_inode(dentry->d_inode, wim); - if (ret != 0) - return ret; - } - - /* Cannot have a short name but no long name */ - if (dentry->short_name_len && !dentry->file_name_len) { - ERROR("Dentry `%s' has a short name but no long name", - dentry->full_path_utf8); - return WIMLIB_ERR_INVALID_DENTRY; - } - - /* Make sure root dentry is unnamed */ - if (dentry_is_root(dentry)) { - if (dentry->file_name_len) { - ERROR("The root dentry is named `%s', but it must " - "be unnamed", dentry->file_name_utf8); - return WIMLIB_ERR_INVALID_DENTRY; + if (lte->refcnt != lte->real_refcnt) { + if (wimlib_print_errors) { + WARNING("The following lookup table entry has a reference " + "count of %u, but", lte->refcnt); + WARNING("We found %u references to it", + lte->real_refcnt); + print_lookup_table_entry(lte, stderr); } + lte->refcnt = lte->real_refcnt; + ++*(unsigned long *)ctr; } - -#if 0 - /* Check timestamps */ - if (inode->i_last_access_time < inode->i_creation_time || - inode->i_last_write_time < inode->i_creation_time) { - WARNING("Dentry `%s' was created after it was last accessed or " - "written to", dentry->full_path_utf8); - } -#endif - return 0; } -static int image_run_full_verifications(WIMStruct *w) +static void +tally_inode_refcnts(const struct wim_inode *inode, + const struct wim_lookup_table *lookup_table) { - return for_dentry_in_tree(wim_root_dentry(w), verify_dentry, w); + for (unsigned i = 0; i <= inode->i_num_ads; i++) { + struct wim_lookup_table_entry *lte; + lte = inode_stream_lte(inode, i, lookup_table); + if (lte) + lte->real_refcnt += inode->i_nlink; + } } -static int lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr) + +static int +tally_image_refcnts(WIMStruct *wim) { - if (lte->refcnt != lte->real_refcnt) { - WARNING("The following lookup table entry has a reference " - "count of %u, but", lte->refcnt); - WARNING("We found %u references to it", - lte->real_refcnt); - print_lookup_table_entry(lte); - lte->refcnt = lte->real_refcnt; - ++*(unsigned long *)ctr; - } + const struct wim_image_metadata *imd; + const struct wim_inode *inode; + + imd = wim_get_current_image_metadata(wim); + image_for_each_inode(inode, imd) + tally_inode_refcnts(inode, wim->lookup_table); return 0; } + /* Ideally this would be unnecessary... however, the WIMs for Windows 8 are * screwed up because some lookup table entries are referenced more times than * their stated reference counts. So theoretically, if we delete all the @@ -193,131 +84,25 @@ static int lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr) * problem by looking at ALL the images to re-calculate the reference count of * EVERY lookup table entry. This only absolutely has to be done before an image * is deleted or before an image is mounted read-write. */ -int wim_run_full_verifications(WIMStruct *w) +int +wim_recalculate_refcnts(WIMStruct *wim) { + unsigned long num_ltes_with_bogus_refcnt = 0; int ret; - for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL); - w->all_images_verified = 1; - w->full_verification_in_progress = 1; - ret = for_image(w, WIMLIB_ALL_IMAGES, image_run_full_verifications); - w->full_verification_in_progress = 0; - if (ret == 0) { - unsigned long num_ltes_with_bogus_refcnt = 0; - for (int i = 0; i < w->hdr.image_count; i++) - w->image_metadata[i].metadata_lte->real_refcnt++; - for_lookup_table_entry(w->lookup_table, lte_fix_refcnt, - &num_ltes_with_bogus_refcnt); - if (num_ltes_with_bogus_refcnt != 0) { - WARNING("A total of %lu entries in the WIM's stream " - "lookup table had to have\n" - " their reference counts fixed.", - num_ltes_with_bogus_refcnt); - } - } else { - w->all_images_verified = 0; - } - return ret; -} - -/* - * verify_swm_set: - Sanity checks to make sure a set of WIMs correctly - * correspond to a spanned set. - * - * @w: - * Part 1 of the set. - * - * @additional_swms: - * All parts of the set other than part 1. - * - * @num_additional_swms: - * Number of WIMStructs in @additional_swms. Or, the total number of parts - * in the set minus 1. - * - * @return: - * 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid. - */ -int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms, - unsigned num_additional_swms) -{ - unsigned total_parts = w->hdr.total_parts; - int ctype; - const u8 *guid; - - if (total_parts != num_additional_swms + 1) { - ERROR("`%s' says there are %u parts in the spanned set, " - "but %s%u part%s provided", - w->filename, total_parts, - (num_additional_swms + 1 < total_parts) ? "only " : "", - num_additional_swms + 1, - (num_additional_swms) ? "s were" : " was"); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (w->hdr.part_number != 1) { - ERROR("WIM `%s' is not the first part of the split WIM.", - w->filename); - return WIMLIB_ERR_SPLIT_INVALID; - } - for (unsigned i = 0; i < num_additional_swms; i++) { - if (additional_swms[i]->hdr.total_parts != total_parts) { - ERROR("WIM `%s' says there are %u parts in the spanned set, " - "but %u parts were provided", - additional_swms[i]->filename, - additional_swms[i]->hdr.total_parts, - total_parts); - return WIMLIB_ERR_SPLIT_INVALID; - } - } - - /* keep track of ctype and guid just to make sure they are the same for - * all the WIMs. */ - ctype = wimlib_get_compression_type(w); - guid = w->hdr.guid; - - WIMStruct *parts_to_swms[num_additional_swms]; - ZERO_ARRAY(parts_to_swms); - for (unsigned i = 0; i < num_additional_swms; i++) { - - WIMStruct *swm = additional_swms[i]; - - if (wimlib_get_compression_type(swm) != ctype) { - ERROR("The split WIMs do not all have the same " - "compression type"); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) { - ERROR("The split WIMs do not all have the same " - "GUID"); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (swm->hdr.part_number == 1) { - ERROR("WIMs `%s' and `%s' both are marked as the " - "first WIM in the spanned set", - w->filename, swm->filename); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (swm->hdr.part_number == 0 || - swm->hdr.part_number > total_parts) - { - ERROR("WIM `%s' says it is part %u in the spanned set, " - "but the part number must be in the range " - "[1, %u]", - swm->filename, swm->hdr.part_number, total_parts); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (parts_to_swms[swm->hdr.part_number - 2]) - { - ERROR("`%s' and `%s' are both marked as part %u of %u " - "in the spanned set", - parts_to_swms[swm->hdr.part_number - 2]->filename, - swm->filename, - swm->hdr.part_number, - total_parts); - return WIMLIB_ERR_SPLIT_INVALID; - } else { - parts_to_swms[swm->hdr.part_number - 2] = swm; - } + for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL); + ret = for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts); + if (ret) + return ret; + num_ltes_with_bogus_refcnt = 0; + for_lookup_table_entry(wim->lookup_table, lte_fix_refcnt, + &num_ltes_with_bogus_refcnt); + if (num_ltes_with_bogus_refcnt != 0) { + WARNING("A total of %lu entries in the WIM's stream " + "lookup table had to have\n" + " their reference counts fixed.", + num_ltes_with_bogus_refcnt); } + wim->refcnts_ok = 1; return 0; } -