X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=56e77ef759f1ac4fb7bda0e844894af8658895df;hp=f9808ada417943c2aa3826a37f339c643715c525;hb=55491147fce2bc03ffb602a3985e7fd4e32169a3;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e diff --git a/src/verify.c b/src/verify.c index f9808ada..56e77ef7 100644 --- a/src/verify.c +++ b/src/verify.c @@ -8,8 +8,6 @@ /* * Copyright (C) 2012, 2013 Eric Biggers * - * wimlib - Library for working with WIM files - * * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the @@ -26,9 +24,15 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "dentry.h" -#include "lookup_table.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "wimlib/dentry.h" +#include "wimlib/error.h" +#include "wimlib/lookup_table.h" +#include "wimlib/metadata.h" +#include "wimlib/security.h" static int verify_inode(struct wim_inode *inode, const WIMStruct *w) @@ -37,7 +41,6 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) const struct wim_security_data *sd = wim_const_security_data(w); struct wim_dentry *first_dentry = inode_first_dentry(inode); struct wim_dentry *dentry; - int ret = WIMLIB_ERR_INVALID_DENTRY; /* Check the security ID. -1 is valid and means "no security * descriptor". Anything else has to be a valid index into the WIM @@ -45,15 +48,17 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) if (inode->i_security_id < -1) { ERROR("Dentry `%"TS"' has an invalid security ID (%d)", dentry_full_path(first_dentry), inode->i_security_id); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } - if (inode->i_security_id >= sd->num_entries) { + if (inode->i_security_id >= 0 && + inode->i_security_id >= sd->num_entries) + { ERROR("Dentry `%"TS"' has an invalid security ID (%d) " "(there are only %u entries in the security table)", dentry_full_path(first_dentry), inode->i_security_id, sd->num_entries); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } /* Check that lookup table entries for all the inode's stream exist, @@ -71,7 +76,7 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) ERROR("Could not find lookup table entry for stream " "%u of dentry `%"TS"'", i, dentry_full_path(first_dentry)); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } if (lte) lte->real_refcnt += inode->i_nlink; @@ -89,7 +94,7 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) if (num_unnamed_streams > 1) { ERROR("Dentry `%"TS"' has multiple (%u) un-named streams", dentry_full_path(first_dentry), num_unnamed_streams); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } /* Files cannot have multiple DOS names, even if they have multiple @@ -103,7 +108,7 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) "both `%"TS"' and `%"TS"'", dentry_full_path(dentry_with_dos_name), dentry_full_path(dentry)); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } dentry_with_dos_name = dentry; } @@ -113,13 +118,11 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w) if (inode->i_nlink > 1 && inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { ERROR("Hard-linked directory `%"TS"' is unsupported", dentry_full_path(first_dentry)); - goto out; + return WIMLIB_ERR_INVALID_DENTRY; } inode->i_verified = 1; - ret = 0; -out: - return ret; + return 0; } /* Run some miscellaneous verifications on a WIM dentry */ @@ -134,7 +137,7 @@ verify_dentry(struct wim_dentry *dentry, void *wim) * in which case we need to force the inode to be verified again.) */ if (!dentry->d_inode->i_verified) { ret = verify_inode(dentry->d_inode, w); - if (ret != 0) + if (ret) return ret; } @@ -175,10 +178,9 @@ image_run_full_verifications(WIMStruct *w) { struct wim_image_metadata *imd; struct wim_inode *inode; - struct hlist_node *cur; imd = wim_get_current_image_metadata(w); - hlist_for_each_entry(inode, cur, &imd->inode_list, i_hlist) + image_for_each_inode(inode, imd) inode->i_verified = 0; return for_dentry_in_tree(imd->root_dentry, verify_dentry, w); } @@ -233,111 +235,3 @@ wim_run_full_verifications(WIMStruct *w) } 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("`%"TS"' says there are %u parts in the spanned set, " - "but %"TS"%u part%"TS" provided", - w->filename, total_parts, - (num_additional_swms + 1 < total_parts) ? T("only ") : T(""), - num_additional_swms + 1, - (num_additional_swms) ? T("s were") : T(" was")); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (w->hdr.part_number != 1) { - ERROR("WIM `%"TS"' 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 `%"TS"' 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; - - { - /* parts_to_swms is not allocated at function scope because it - * should only be allocated after num_additional_swms was - * checked to be the same as w->hdr.total_parts. Otherwise, it - * could be unexpectedly high and cause a stack overflow. */ - 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 `%"TS"' and `%"TS"' 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 `%"TS"' 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("`%"TS"' and `%"TS"' 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; - } - } - } - return 0; -}