/*
* security.c
*
- * 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.
+ * Read and write the per-WIM-image table of security descriptors.
*/
/*
*/
#include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
#include "security.h"
/*
*
* @metadata_resource: An array that contains the uncompressed metadata
* resource for the WIM file.
- * @metadata_resource_len: The length of @metadata_resource. It MUST be at
+ * @metadata_resource_len: The length of @metadata_resource. It must be at
* least 8 bytes.
* @sd_p: 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
int ret;
u64 total_len;
+ wimlib_assert(metadata_resource_len >= 8);
+
/*
* Sorry this function is excessively complicated--- I'm just being
* extremely careful about integer overflows.
sd->num_entries, sd->total_length);
if (sd->num_entries == 0) {
- /* No security descriptors. */
+ /* No security descriptors. We allow the total_length field to
+ * be either 8 (which is correct, since there are always 2
+ * 32-bit integers) or 0. */
if (sd->total_length != 0 && sd->total_length != 8) {
ERROR("Invalid security data length (%u): expected 0 or 8",
sd->total_length);
u64 size_no_descriptors = 8 + sizes_size;
if (size_no_descriptors > (u64)sd->total_length) {
ERROR("Security data total length of %u is too short because "
- "there must be at least %"PRIu64" bytes of security data",
+ "there seem to be at least %"PRIu64" bytes of security data",
sd->total_length, 8 + sizes_size);
goto out_invalid_sd;
}
- if (sizeof(size_t) < 8 && sizes_size > 0xffffffff) {
- ERROR("Too many security descriptors!");
- goto out_invalid_sd;
- }
+
sd->sizes = MALLOC(sizes_size);
if (!sd->sizes) {
ret = WIMLIB_ERR_NOMEM;
goto out_invalid_sd;
}
total_len += sd->sizes[i];
- /* This check assures that the descriptor size fits in a 32 bit
+ /* This check ensures that the descriptor size fits in a 32 bit
* integer. Because if it didn't, the total length would come
* out bigger than sd->total_length, which is a 32 bit integer.
* */
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);
+ "because there seem to be at least %"PRIu64" "
+ "bytes of security data",
+ sd->total_length, total_len);
goto out_invalid_sd;
}
sd->descriptors[i] = MALLOC(sd->sizes[i]);
printf(" ACE Count = %u\n", ace_count);
p += sizeof(ACL);
- for (uint i = 0; i < acl->ace_count; i++) {
+ for (u16 i = 0; i < ace_count; i++) {
const ACEHeader *hdr = (const ACEHeader*)p;
printf(" [ACE]\n");
printf(" ACE type = %d\n", hdr->type);
print_byte_field(sid->identifier_authority,
sizeof(sid->identifier_authority));
putchar('\n');
- for (uint i = 0; i < sid->sub_authority_count; i++)
+ for (u8 i = 0; i < sid->sub_authority_count; i++)
printf(" Subauthority %u = %u\n",
i, le32_to_cpu(sid->sub_authority[i]));
putchar('\n');