X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsecurity.c;h=fef6043af2fdc0f5910f2c816aaf68b16ffe9c42;hb=02ba077b44a9a78327408541da6c78c0238f114b;hp=9707bd313359383f4b8a6c9bd4f81e0fe11eedeb;hpb=6f7956a06fcf92a304fae93e393e8eaee34e92d5;p=wimlib diff --git a/src/security.c b/src/security.c index 9707bd31..fef6043a 100644 --- a/src/security.c +++ b/src/security.c @@ -1,8 +1,9 @@ /* * security.c * - * Read the security data from the WIM. Doing anything with the security data - * is not yet implemented other than printing some information about it. + * Read and write the WIM security data. The security data is a table of + * security descriptors. Each WIM image has its own security data, but it's + * possible that an image's security data have no security descriptors. */ /* @@ -11,16 +12,16 @@ * 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 - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * 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 Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -28,7 +29,28 @@ #include "io.h" #include "security.h" -#ifdef ENABLE_SECURITY_DATA +/* + * This is a hack to work around a problem in libntfs-3g. libntfs-3g validates + * security descriptors with a function named ntfs_valid_descr(). + * ntfs_valid_descr() considers a security descriptor that ends in a SACL + * (Sysetm Access Control List) with no ACE's (Access Control Entries) to be + * invalid. However, a security descriptor like this exists in the Windows 7 + * install.wim. Here, security descriptors matching this pattern are modified + * to have no SACL. This should make no difference since the SACL had no + * entries anyway; however his ensures that that the security descriptors pass + * the validation in libntfs-3g. + */ +static void empty_sacl_fixup(char *descr, u64 *size_p) +{ + if (*size_p >= sizeof(SecurityDescriptor)) { + SecurityDescriptor *sd = (SecurityDescriptor*)descr; + u32 sacl_offset = le32_to_cpu(sd->sacl_offset); + if (sacl_offset == *size_p - sizeof(ACL)) { + sd->sacl_offset = to_le32(0); + *size_p -= sizeof(ACL); + } + } +} /* * Reads the security data from the metadata resource. @@ -63,7 +85,13 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, p = metadata_resource; p = get_u32(p, &sd->total_length); - p = get_u32(p, &sd->num_entries); + p = get_u32(p, (u32*)&sd->num_entries); + + if (sd->num_entries > 0x7fffffff) { + ERROR("Security data has too many entries!"); + ret = WIMLIB_ERR_INVALID_SECURITY_DATA; + goto out_free_sd; + } /* Verify the listed total length of the security data is big enough to * include the sizes array, verify that the file data is big enough to @@ -77,7 +105,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, ERROR("Security data total length (%u) is bigger than the " "metadata resource length (%"PRIu64")", sd->total_length, metadata_resource_len); - ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE; + ret = WIMLIB_ERR_INVALID_SECURITY_DATA; goto out_free_sd; } @@ -96,7 +124,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, ERROR("Security data total length of %u is too short because " "there must be at least %"PRIu64" bytes of security data", sd->total_length, 8 + sizes_size); - ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE; + ret = WIMLIB_ERR_INVALID_SECURITY_DATA; goto out_free_sd; } sd->sizes = MALLOC(sizes_size); @@ -127,13 +155,15 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, "(current total length = %"PRIu64", security " "descriptor size = %"PRIu64")", total_len, sd->sizes[i]); + ret = WIMLIB_ERR_INVALID_SECURITY_DATA; + goto out_free_sd; } total_len += sd->sizes[i]; if (total_len > (u64)sd->total_length) { ERROR("Security data total length of %u is too short " "because there are at least %"PRIu64" bytes of " "security data", sd->total_length, total_len); - ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE; + ret = WIMLIB_ERR_INVALID_SECURITY_DATA; goto out_free_sd; } sd->descriptors[i] = MALLOC(sd->sizes[i]); @@ -144,6 +174,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, goto out_free_sd; } p = get_bytes(p, sd->sizes[i], sd->descriptors[i]); + empty_sacl_fixup(sd->descriptors[i], &sd->sizes[i]); } out: sd->total_length = (u32)total_len; @@ -162,8 +193,10 @@ u8 *write_security_data(const struct wim_security_data *sd, u8 *p) DEBUG("Writing security data (total_length = %"PRIu32", num_entries " "= %"PRIu32")", sd->total_length, sd->num_entries); + u32 aligned_length = (sd->total_length + 7) & ~7; + u8 *orig_p = p; - p = put_u32(p, sd->total_length); + p = put_u32(p, aligned_length); p = put_u32(p, sd->num_entries); for (u32 i = 0; i < sd->num_entries; i++) @@ -173,22 +206,18 @@ u8 *write_security_data(const struct wim_security_data *sd, u8 *p) p = put_bytes(p, sd->sizes[i], sd->descriptors[i]); wimlib_assert(p - orig_p == sd->total_length); + p = put_zeroes(p, aligned_length - sd->total_length); DEBUG("Successfully wrote security data."); return p; } -/* XXX We don't actually do anything with the ACL's yet besides being able to - * print a few things. It seems it would be a lot of work to have comprehensive - * support for all the weird flags and stuff, and Windows PE seems to be okay - * running from a WIM file that doesn't have any security data at all... */ - -static void print_acl(const u8 *p) +static void print_acl(const u8 *p, const char *type) { ACL *acl = (ACL*)p; TO_LE16(acl->acl_size); TO_LE16(acl->acl_count); - printf(" [ACL]\n"); + printf(" [%s ACL]\n", type); printf(" Revision = %u\n", acl->revision); printf(" ACL Size = %u\n", acl->acl_size); printf(" ACE Count = %u\n", acl->ace_count); @@ -205,12 +234,13 @@ static void print_acl(const u8 *p) printf(" SID start = %u\n", to_le32(aaa->sid_start)); p += hdr->size; } + putchar('\n'); } -static void print_sid(const u8 *p) +static void print_sid(const u8 *p, const char *type) { SID *sid = (SID*)p; - printf(" [SID]\n"); + printf(" [%s SID]\n", type); printf(" Revision = %u\n", sid->revision); printf(" Subauthority count = %u\n", sid->sub_authority_count); printf(" Identifier authority = "); @@ -218,6 +248,7 @@ static void print_sid(const u8 *p) putchar('\n'); for (uint i = 0; i < sid->sub_authority_count; i++) printf(" Subauthority %u = %u\n", i, to_le32(sid->sub_authority[i])); + putchar('\n'); } static void print_security_descriptor(const u8 *p, u64 size) @@ -229,20 +260,20 @@ static void print_security_descriptor(const u8 *p, u64 size) TO_LE32(sd->sacl_offset); TO_LE32(sd->dacl_offset); printf("Revision = %u\n", sd->revision); - printf("Security Descriptor Control = %u\n", sd->security_descriptor_control); + printf("Security Descriptor Control = %#x\n", sd->security_descriptor_control); printf("Owner offset = %u\n", sd->owner_offset); printf("Group offset = %u\n", sd->group_offset); printf("System ACL offset = %u\n", sd->sacl_offset); printf("Discretionary ACL offset = %u\n", sd->dacl_offset); if (sd->owner_offset != 0) - print_sid(p + sd->owner_offset); + print_sid(p + sd->owner_offset, "Owner"); if (sd->group_offset != 0) - print_sid(p + sd->group_offset); + print_sid(p + sd->group_offset, "Group"); if (sd->sacl_offset != 0) - print_acl(p + sd->sacl_offset); + print_acl(p + sd->sacl_offset, "System"); if (sd->dacl_offset != 0) - print_acl(p + sd->dacl_offset); + print_acl(p + sd->dacl_offset, "Discretionary"); } /* @@ -267,8 +298,8 @@ void free_security_data(struct wim_security_data *sd) { if (!sd) return; - wimlib_assert(sd->refcnt >= 1); - if (sd->refcnt == 1) { + wimlib_assert(sd->refcnt != 0); + if (--sd->refcnt == 0) { u8 **descriptors = sd->descriptors; u32 num_entries = sd->num_entries; if (descriptors) @@ -277,9 +308,5 @@ void free_security_data(struct wim_security_data *sd) FREE(sd->sizes); FREE(sd->descriptors); FREE(sd); - } else { - sd->refcnt--; } } - -#endif