win32_set_security_descriptor(): Check handle before closing

[wimlib] / src / win32_apply.c

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 4c66575280f431109810bc244ef8f0f47f227a7b..6ac9e4090ec53bac1bf7585327652e1f433ab39f 100644 (file)
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -81,21 +81,63 @@ win32_start_extract(const wchar_t *path, struct apply_ctx *ctx)
        return 0;
 }
 
+/* Create a normal file, overwriting one already present.  */
 static int
 win32_create_file(const wchar_t *path, struct apply_ctx *ctx, u64 *cookie_ret)
 {
        HANDLE h;
-
-       h = CreateFile(path, 0, 0, NULL, CREATE_ALWAYS,
-                      FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, NULL);
-       if (h == INVALID_HANDLE_VALUE)
-               goto error;
+       unsigned retry_count = 0;
+       DWORD dwFlagsAndAttributes = FILE_FLAG_BACKUP_SEMANTICS;
+
+retry:
+       /* WRITE_OWNER and WRITE_DAC privileges are required for some reason,
+        * even through we're creating a new file.  */
+       h = CreateFile(path, WRITE_OWNER | WRITE_DAC, 0, NULL,
+                      CREATE_ALWAYS, dwFlagsAndAttributes, NULL);
+       if (h == INVALID_HANDLE_VALUE) {
+               /* File couldn't be created.  */
+               DWORD err = GetLastError();
+               if (err == ERROR_ACCESS_DENIED && retry_count == 0) {
+
+                       /* Access denied error for the first time.  Try
+                        * adjusting file attributes.  */
+
+                       /* Get attributes of the existing file.  */
+                       DWORD attribs = GetFileAttributes(path);
+                       if (attribs != INVALID_FILE_ATTRIBUTES &&
+                           (attribs & (FILE_ATTRIBUTE_HIDDEN |
+                                       FILE_ATTRIBUTE_SYSTEM |
+                                       FILE_ATTRIBUTE_READONLY)))
+                       {
+                               /* If the existing file has
+                                * FILE_ATTRIBUTE_HIDDEN and/or
+                                * FILE_ATTRIBUTE_SYSTEM, they must be set in
+                                * the call to CreateFile().  This is true even
+                                * when FILE_ATTRIBUTE_NORMAL was not specified,
+                                * contrary to the MS "documentation".  */
+                               dwFlagsAndAttributes |= (attribs &
+                                                        (FILE_ATTRIBUTE_HIDDEN |
+                                                         FILE_ATTRIBUTE_SYSTEM));
+                               /* If the existing file has
+                                * FILE_ATTRIBUTE_READONLY, it must be cleared
+                                * before attempting to create a new file over
+                                * it.  This is true even when the process has
+                                * the SE_RESTORE_NAME privilege and requested
+                                * the FILE_FLAG_BACKUP_SEMANTICS flag to
+                                * CreateFile().  */
+                               if (attribs & FILE_ATTRIBUTE_READONLY) {
+                                       SetFileAttributes(path,
+                                                         attribs & ~FILE_ATTRIBUTE_READONLY);
+                               }
+                               retry_count++;
+                               goto retry;
+                       }
+               }
+               set_errno_from_win32_error(err);
+               return WIMLIB_ERR_OPEN;
+       }
        CloseHandle(h);
        return 0;
-
-error:
-       set_errno_from_GetLastError();
-       return WIMLIB_ERR_OPEN;
 }
 
 static int
@@ -195,8 +237,7 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name,
        ret = 0;
        if (!lte)
                goto out_close_handle;
-       ret = extract_wim_resource(lte, wim_resource_size(lte),
-                                  win32_extract_wim_chunk, h);
+       ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h);
 out_close_handle:
        if (!CloseHandle(h))
                goto error;
@@ -239,9 +280,9 @@ win32_encrypted_import_cb(unsigned char *data, void *_import_ctx,
        unsigned long len = *len_p;
        const struct wim_lookup_table_entry *lte = import_ctx->lte;
 
-       len = min(len, wim_resource_size(lte) - import_ctx->offset);
+       len = min(len, lte->size - import_ctx->offset);
 
-       if (read_partial_wim_resource_into_buf(lte, len, import_ctx->offset, data))
+       if (read_partial_wim_stream_into_buf(lte, len, import_ctx->offset, data))
                return ERROR_READ_FAULT;
 
        import_ctx->offset += len;
@@ -531,12 +572,13 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
                        ctx->no_security_descriptors++;
                        break;
                }
+               SetLastError(err);
                goto error;
        }
        ret = 0;
 out_close:
 #ifdef WITH_NTDLL
-       if (func_NtSetSecurityObject)
+       if (func_NtSetSecurityObject && h != INVALID_HANDLE_VALUE)
                CloseHandle(h);
 #endif
        return ret;