X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsecurity.c;h=85cfb5bc6ce968f85671672577bd0c3984a69e41;hp=cac61917653157e8b67761816416c1f9c9b4a5d2;hb=542225070ab6583b6f5915172425cac6e0326d77;hpb=2850f8933244f6c63f608eec612ad804e01072e1 diff --git a/src/security.c b/src/security.c index cac61917..85cfb5bc 100644 --- a/src/security.c +++ b/src/security.c @@ -5,22 +5,20 @@ */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2014 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H @@ -28,6 +26,7 @@ #endif #include "wimlib/assert.h" +#include "wimlib/avl_tree.h" #include "wimlib/endianness.h" #include "wimlib/error.h" #include "wimlib/security.h" @@ -49,12 +48,13 @@ new_wim_security_data(void) /* * Reads the security data from the metadata resource of a WIM image. * - * @metadata_resource: An array that contains the uncompressed metadata - * resource for the WIM image. - * @metadata_resource_len: The length of @metadata_resource. - * @sd_ret: A pointer to a pointer to a wim_security_data structure that - * will be filled in with a pointer to a new wim_security_data - * structure containing the security data on success. + * @buf + * Buffer containing an uncompressed WIM metadata resource. + * @buf_len + * Length of the uncompressed metadata resource, in bytes. + * @sd_ret + * On success, a pointer to the resulting security data structure will be + * returned here. * * Note: There is no `offset' argument because the security data is located at * the beginning of the metadata resource. @@ -65,7 +65,7 @@ new_wim_security_data(void) * WIMLIB_ERR_NOMEM */ int -read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_len, +read_wim_security_data(const u8 *buf, size_t buf_len, struct wim_security_data **sd_ret) { struct wim_security_data *sd; @@ -76,20 +76,17 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le const struct wim_security_data_disk *sd_disk; const u8 *p; - if (metadata_resource_len < 8) + if (buf_len < 8) return WIMLIB_ERR_INVALID_METADATA_RESOURCE; sd = new_wim_security_data(); if (!sd) goto out_of_memory; - sd_disk = (const struct wim_security_data_disk*)metadata_resource; - sd->total_length = le32_to_cpu(sd_disk->total_length); + sd_disk = (const struct wim_security_data_disk *)buf; + sd->total_length = ALIGN(le32_to_cpu(sd_disk->total_length), 8); sd->num_entries = le32_to_cpu(sd_disk->num_entries); - DEBUG("Reading security data: num_entries=%u, total_length=%u", - sd->num_entries, sd->total_length); - /* Length field of 0 is a special case that really means length * of 8. */ if (sd->total_length == 0) @@ -111,7 +108,7 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le * integer, even though each security descriptor size is a 64-bit * integer. This is stupid, and we need to be careful not to actually * let the security descriptor sizes be over 0xffffffff. */ - if (sd->total_length > metadata_resource_len) + if (sd->total_length > buf_len) goto out_invalid_sd; sizes_size = (u64)sd->num_entries * sizeof(u64); @@ -123,7 +120,7 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le /* Return immediately if no security descriptors. */ if (sd->num_entries == 0) - goto out_align_total_length; + goto out_descriptors_ready; /* Allocate a new buffer for the sizes array */ sd->sizes = MALLOC(sizes_size); @@ -156,13 +153,11 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le goto out_of_memory; p += sd->sizes[i]; } -out_align_total_length: - total_len = (total_len + 7) & ~7; - sd->total_length = (sd->total_length + 7) & ~7; - if (total_len != sd->total_length) { - WARNING("Expected WIM security data total length of " - "%u bytes, but calculated %u bytes", - sd->total_length, (unsigned)total_len); +out_descriptors_ready: + if (ALIGN(total_len, 8) != sd->total_length) { + WARNING("Stored WIM security data total length was " + "%"PRIu32" bytes, but calculated %"PRIu32" bytes", + sd->total_length, (u32)total_len); } *sd_ret = sd; ret = 0; @@ -187,9 +182,6 @@ u8 * write_wim_security_data(const struct wim_security_data * restrict sd, u8 * restrict p) { - DEBUG("Writing security data (total_length = %"PRIu32", num_entries " - "= %"PRIu32")", sd->total_length, sd->num_entries); - u8 *orig_p = p; struct wim_security_data_disk *sd_disk = (struct wim_security_data_disk*)p; u32 num_entries = sd->num_entries; @@ -209,8 +201,6 @@ write_wim_security_data(const struct wim_security_data * restrict sd, *p++ = 0; wimlib_assert(p - orig_p == sd->total_length); - - DEBUG("Successfully wrote security data."); return p; } @@ -230,79 +220,72 @@ free_wim_security_data(struct wim_security_data *sd) } struct sd_node { - int security_id; + s32 security_id; u8 hash[SHA1_HASH_SIZE]; - struct rb_node rb_node; + struct avl_tree_node index_node; }; +#define SD_NODE(avl_node) \ + avl_tree_entry(avl_node, struct sd_node, index_node) + static void -free_sd_tree(struct rb_node *node) +free_sd_tree(struct avl_tree_node *node) { if (node) { - free_sd_tree(node->rb_left); - free_sd_tree(node->rb_right); - FREE(container_of(node, struct sd_node, rb_node)); + free_sd_tree(node->left); + free_sd_tree(node->right); + FREE(SD_NODE(node)); } } +void +rollback_new_security_descriptors(struct wim_sd_set *sd_set) +{ + struct wim_security_data *sd = sd_set->sd; + u8 **descriptors = sd->descriptors + sd_set->orig_num_entries; + u32 num_entries = sd->num_entries - sd_set->orig_num_entries; + while (num_entries--) + FREE(*descriptors++); + sd->num_entries = sd_set->orig_num_entries; +} + /* Frees a security descriptor index set. */ void -destroy_sd_set(struct wim_sd_set *sd_set, bool rollback) +destroy_sd_set(struct wim_sd_set *sd_set) { - if (rollback) { - struct wim_security_data *sd = sd_set->sd; - u8 **descriptors = sd->descriptors + sd_set->orig_num_entries; - u32 num_entries = sd->num_entries - sd_set->orig_num_entries; - while (num_entries--) - FREE(*descriptors++); - sd->num_entries = sd_set->orig_num_entries; - } - free_sd_tree(sd_set->rb_root.rb_node); + free_sd_tree(sd_set->root); +} + +static int +_avl_cmp_nodes_by_hash(const struct avl_tree_node *n1, + const struct avl_tree_node *n2) +{ + return hashes_cmp(SD_NODE(n1)->hash, SD_NODE(n2)->hash); } -/* Inserts a a new node into the security descriptor index tree. */ +/* Inserts a new node into the security descriptor index tree. Returns true + * if successful (not a duplicate). */ static bool insert_sd_node(struct wim_sd_set *set, struct sd_node *new) { - struct rb_root *root = &set->rb_root; - struct rb_node **p = &(root->rb_node); - struct rb_node *rb_parent = NULL; - - while (*p) { - struct sd_node *this = container_of(*p, struct sd_node, rb_node); - int cmp = hashes_cmp(new->hash, this->hash); - - rb_parent = *p; - if (cmp < 0) - p = &((*p)->rb_left); - else if (cmp > 0) - p = &((*p)->rb_right); - else - return false; /* Duplicate security descriptor */ - } - rb_link_node(&new->rb_node, rb_parent, p); - rb_insert_color(&new->rb_node, root); - return true; + return NULL == avl_tree_insert(&set->root, &new->index_node, + _avl_cmp_nodes_by_hash); } /* Returns the index of the security descriptor having a SHA1 message digest of * @hash. If not found, return -1. */ -static int +static s32 lookup_sd(struct wim_sd_set *set, const u8 hash[SHA1_HASH_SIZE]) { - struct rb_node *node = set->rb_root.rb_node; - - while (node) { - struct sd_node *sd_node = container_of(node, struct sd_node, rb_node); - int cmp = hashes_cmp(hash, sd_node->hash); - if (cmp < 0) - node = node->rb_left; - else if (cmp > 0) - node = node->rb_right; - else - return sd_node->security_id; - } - return -1; + struct avl_tree_node *res; + struct sd_node dummy; + + copy_hash(dummy.hash, hash); + res = avl_tree_lookup_node(set->root, &dummy.index_node, + _avl_cmp_nodes_by_hash); + if (!res) + return -1; + return SD_NODE(res)->security_id; } /* @@ -312,11 +295,11 @@ lookup_sd(struct wim_sd_set *set, const u8 hash[SHA1_HASH_SIZE]) * the security ID for it. If a new security descriptor cannot be allocated, * return -1. */ -int +s32 sd_set_add_sd(struct wim_sd_set *sd_set, const char *descriptor, size_t size) { u8 hash[SHA1_HASH_SIZE]; - int security_id; + s32 security_id; struct sd_node *new; u8 **descriptors; u64 *sizes; @@ -361,7 +344,6 @@ sd_set_add_sd(struct wim_sd_set *sd_set, const char *descriptor, size_t size) sd->descriptors[sd->num_entries] = descr_copy; sd->sizes[sd->num_entries] = size; sd->num_entries++; - DEBUG("There are now %u security descriptors", sd->num_entries); bret = insert_sd_node(sd_set, new); wimlib_assert(bret); security_id = new->security_id; @@ -383,7 +365,7 @@ init_sd_set(struct wim_sd_set *sd_set, struct wim_security_data *sd) int ret; sd_set->sd = sd; - sd_set->rb_root.rb_node = NULL; + sd_set->root = NULL; /* Remember the original number of security descriptors so that newly * added ones can be rolled back if needed. */ @@ -404,7 +386,7 @@ init_sd_set(struct wim_sd_set *sd_set, struct wim_security_data *sd) ret = 0; goto out; out_destroy_sd_set: - destroy_sd_set(sd_set, false); + destroy_sd_set(sd_set); out: return ret; }