X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsecurity.c;h=dd9d1d82b9df56a1763799c9fdae2731c9a42064;hp=ec1590f6f09a7636ff9a29a929eaf0712ff71a1a;hb=1bf2548cc5ad9e94951c43b8c223cec058d28294;hpb=f9a65bc36b0c82a7c46feec9140129fd5110289c

diff --git a/src/security.c b/src/security.c
index ec1590f6..dd9d1d82 100644
--- a/src/security.c
+++ b/src/security.c
@@ -1,9 +1,7 @@
 /*
  * 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.
  */
 
 /*
@@ -26,7 +24,7 @@
  */
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
 #include "security.h"
 
 /*
@@ -40,7 +38,7 @@
  * entries anyway; however this ensures that that the security descriptors pass
  * the validation in libntfs-3g.
  */
-static void empty_sacl_fixup(char *descr, u64 *size_p)
+static void empty_sacl_fixup(u8 *descr, u64 *size_p)
 {
 	if (*size_p >= sizeof(SecurityDescriptor)) {
 		SecurityDescriptor *sd = (SecurityDescriptor*)descr;
@@ -57,7 +55,7 @@ static void empty_sacl_fixup(char *descr, u64 *size_p)
  *
  * @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
@@ -74,6 +72,8 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 	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.
@@ -121,7 +121,9 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 	      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);
@@ -135,14 +137,11 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 	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;
@@ -174,14 +173,15 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 			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]);
@@ -195,9 +195,9 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 		empty_sacl_fixup(sd->descriptors[i], &sd->sizes[i]);
 	}
 	wimlib_assert(total_len <= 0xffffffff);
-	if ((total_len + 7 & ~7) != ((sd->total_length + 7) & ~7)) {
+	if (((total_len + 7) & ~7) != ((sd->total_length + 7) & ~7)) {
 		ERROR("Expected security data total length = %u, but "
-		      "calculated %u", sd->total_length, total_len);
+		      "calculated %u", sd->total_length, (unsigned)total_len);
 		goto out_invalid_sd;
 	}
 	sd->total_length = total_len;
@@ -250,7 +250,7 @@ static void print_acl(const u8 *p, const char *type)
 	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);
@@ -274,7 +274,7 @@ static void print_sid(const u8 *p, const char *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');
@@ -328,17 +328,17 @@ void print_security_data(const struct wim_security_data *sd)
 
 void free_security_data(struct wim_security_data *sd)
 {
-	if (!sd)
-		return;
-	wimlib_assert(sd->refcnt != 0);
-	if (--sd->refcnt == 0) {
-		u8 **descriptors = sd->descriptors;
-		u32 num_entries  = sd->num_entries;
-		if (descriptors)
-			while (num_entries--)
-				FREE(*descriptors++);
-		FREE(sd->sizes);
-		FREE(sd->descriptors);
-		FREE(sd);
+	if (sd) {
+		wimlib_assert(sd->refcnt != 0);
+		if (--sd->refcnt == 0) {
+			u8 **descriptors = sd->descriptors;
+			u32 num_entries  = sd->num_entries;
+			if (descriptors)
+				while (num_entries--)
+					FREE(*descriptors++);
+			FREE(sd->sizes);
+			FREE(sd->descriptors);
+			FREE(sd);
+		}
 	}
 }