* moving the empty SACL earlier in the security descriptor or by removing the
* SACL entirely. The latter work-around is valid because an empty SACL is
* equivalent to a "null", or non-existent, SACL.
- * - Versions up to and including 2013.1.13 reject security descriptors ending
- * with an empty DACL (Discretionary Access Control List). This is very
- * similar to the SACL bug and should be fixed in the next release after
- * 2013.1.13. However, removing the DACL is not a valid workaround because
- * this changes the meaning of the security descriptor--- an empty DACL allows
- * no access, whereas a "null" DACL allows all access.
+ * - Versions before 2014.2.15 reject security descriptors ending with an empty
+ * DACL (Discretionary Access Control List). This is very similar to the SACL
+ * bug. However, removing the DACL is not a valid workaround because this
+ * changes the meaning of the security descriptor--- an empty DACL allows no
+ * access, whereas a "null" DACL allows all access.
*
* If the security descriptor was fixed, this function returns an allocated
* buffer containing the fixed security descriptor, and its size is updated.
- * Otherwise (or if no memory is available) the original descriptor is returned.
+ * Otherwise (or if no memory is available) NULL is returned.
*/
-static u8 *
-sd_fixup(const u8 *_desc, size_t *size_p)
+static void *
+sd_fixup(const void *_desc, size_t *size_p)
{
- u32 owner_offset, group_offset, dacl_offset;
-#if !defined(HAVE_NTFS_MNT_RDONLY)
- u32 sacl_offset;
-#endif
+ u32 owner_offset, group_offset, dacl_offset, sacl_offset;
bool owner_valid, group_valid;
size_t size = *size_p;
- const wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc =
- (const wimlib_SECURITY_DESCRIPTOR_RELATIVE*)_desc;
+ const wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc = _desc;
wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc_new;
const wimlib_SID *owner, *group, *sid;
/* Don't attempt to fix clearly invalid security descriptors. */
if (size < sizeof(wimlib_SECURITY_DESCRIPTOR_RELATIVE))
- return (u8*)_desc;
+ return NULL;
if (le16_to_cpu(desc->control) & wimlib_SE_DACL_PRESENT)
dacl_offset = le32_to_cpu(desc->dacl_offset);
else
dacl_offset = 0;
-#if !defined(HAVE_NTFS_MNT_RDONLY)
if (le16_to_cpu(desc->control) & wimlib_SE_SACL_PRESENT)
sacl_offset = le32_to_cpu(desc->sacl_offset);
else
sacl_offset = 0;
-#endif
/* Check if the security descriptor will be affected by one of the bugs.
- * If not, do nothing and return.
- *
- * Note: HAVE_NTFS_MNT_RDONLY is defined if libntfs-3g is
- * version 2013.1.13 or later. */
- if (!(
- #if !defined(HAVE_NTFS_MNT_RDONLY)
- (sacl_offset != 0 && sacl_offset == size - sizeof(wimlib_ACL)) ||
- #endif
- (dacl_offset != 0 && dacl_offset == size - sizeof(wimlib_ACL))))
- return (u8*)_desc;
+ * If not, do nothing and return. */
+ if (!((sacl_offset != 0 && sacl_offset == size - sizeof(wimlib_ACL)) ||
+ (dacl_offset != 0 && dacl_offset == size - sizeof(wimlib_ACL))))
+ return NULL;
owner_offset = le32_to_cpu(desc->owner_offset);
group_offset = le32_to_cpu(desc->group_offset);
} else if (group_valid) {
sid = group;
} else {
- return (u8*)_desc;
+ return NULL;
}
desc_new = MALLOC(size + sid_size(sid));
if (!desc_new)
- return (u8*)_desc;
+ return NULL;
memcpy(desc_new, desc, size);
if (owner_valid)
desc_new->group_offset = cpu_to_le32(size);
memcpy((u8*)desc_new + size, sid, sid_size(sid));
*size_p = size + sid_size(sid);
- return (u8*)desc_new;
+ return desc_new;
}
/* Set the security descriptor @desc of size @desc_size on the NTFS inode @ni.
ntfs_3g_set_security_descriptor(ntfs_inode *ni, const void *desc, size_t desc_size)
{
struct SECURITY_CONTEXT sec_ctx;
- u8 *desc_fixed;
+ void *desc_fixed = NULL;
int ret = 0;
memset(&sec_ctx, 0, sizeof(sec_ctx));
sec_ctx.vol = ni->vol;
- desc_fixed = sd_fixup(desc, &desc_size);
-
- if (ntfs_set_ntfs_acl(&sec_ctx, ni, desc_fixed, desc_size, 0))
+retry:
+ if (ntfs_set_ntfs_acl(&sec_ctx, ni, desc, desc_size, 0)) {
+ if (desc_fixed == NULL) {
+ desc_fixed = sd_fixup(desc, &desc_size);
+ if (desc_fixed != NULL) {
+ desc = desc_fixed;
+ goto retry;
+ }
+ }
ret = WIMLIB_ERR_SET_SECURITY;
+ }
- if (desc_fixed != desc)
- FREE(desc_fixed);
-
+ FREE(desc_fixed);
return ret;
}
return ret;
}
+static int
+ntfs_3g_restore_reparse_point(ntfs_inode *ni, const struct wim_inode *inode,
+ unsigned blob_size, struct ntfs_3g_apply_ctx *ctx)
+{
+ complete_reparse_point(&ctx->rpbuf, inode, blob_size);
+
+ if (ntfs_set_ntfs_reparse_data(ni, (const char *)&ctx->rpbuf,
+ REPARSE_DATA_OFFSET + blob_size, 0))
+ {
+ ERROR_WITH_ERRNO("Failed to set reparse data on \"%s\"",
+ dentry_full_path(
+ inode_first_extraction_dentry(inode)));
+ return WIMLIB_ERR_SET_REPARSE_DATA;
+ }
+
+ return 0;
+}
+
+
/*
- * Create empty named data streams for the specified file, if there are any.
+ * Create empty attributes (named data streams and potentially a reparse point)
+ * for the specified file, if there are any.
*
* Since these won't have blob descriptors, they won't show up in the call to
* extract_blob_list(). Hence the need for the special case.
*/
static int
-ntfs_3g_create_empty_named_data_streams(ntfs_inode *ni,
- const struct wim_inode *inode,
- const struct ntfs_3g_apply_ctx *ctx)
+ntfs_3g_create_empty_attributes(ntfs_inode *ni,
+ const struct wim_inode *inode,
+ struct ntfs_3g_apply_ctx *ctx)
{
+
for (unsigned i = 0; i < inode->i_num_streams; i++) {
const struct wim_inode_stream *strm = &inode->i_streams[i];
+ int ret;
- if (!stream_is_named_data_stream(strm) ||
- stream_blob_resolved(strm) != NULL)
+ if (stream_blob_resolved(strm) != NULL)
continue;
- if (ntfs_attr_add(ni, AT_DATA, strm->stream_name,
- utf16le_len_chars(strm->stream_name),
- NULL, 0))
- {
- ERROR_WITH_ERRNO("Failed to create named data stream "
- "of \"%s\"", dentry_full_path(
- inode_first_extraction_dentry(inode)));
- return WIMLIB_ERR_NTFS_3G;
+ if (strm->stream_type == STREAM_TYPE_REPARSE_POINT) {
+ ret = ntfs_3g_restore_reparse_point(ni, inode, 0, ctx);
+ if (ret)
+ return ret;
+ } else if (stream_is_named_data_stream(strm)) {
+ if (ntfs_attr_add(ni, AT_DATA, strm->stream_name,
+ utf16le_len_chars(strm->stream_name),
+ NULL, 0))
+ {
+ ERROR_WITH_ERRNO("Failed to create named data "
+ "stream of \"%s\"",
+ dentry_full_path(
+ inode_first_extraction_dentry(inode)));
+ return WIMLIB_ERR_NTFS_3G;
+ }
}
}
return 0;
if (!ret)
ret = ntfs_3g_set_metadata(ni, child->d_inode, ctx);
if (!ret)
- ret = ntfs_3g_create_empty_named_data_streams(ni, child->d_inode, ctx);
+ ret = ntfs_3g_create_empty_attributes(ni, child->d_inode, ctx);
if (!ret)
ret = ntfs_3g_create_dirs_recursive(ni, child, ctx);
static int
ntfs_3g_create_nondirectory(struct wim_inode *inode,
- const struct ntfs_3g_apply_ctx *ctx)
+ struct ntfs_3g_apply_ctx *ctx)
{
struct wim_dentry *first_dentry;
ntfs_inode *dir_ni;
if (ret)
goto out_close_ni;
- ret = ntfs_3g_create_empty_named_data_streams(ni, inode, ctx);
+ ret = ntfs_3g_create_empty_attributes(ni, inode, ctx);
out_close_ni:
/* Close the inode. */
static ntfs_inode *
ntfs_3g_open_inode(struct wim_inode *inode, struct ntfs_3g_apply_ctx *ctx)
{
- ntfs_inode *ni = NULL;
+ ntfs_inode *ni;
- if (inode->i_visited) {
- for (u32 i = 0; i < ctx->num_open_inodes; i++) {
+ /* If the same blob is being extracted to multiple streams of the same
+ * inode, then we must only open the inode once. */
+ if (unlikely(inode->i_num_streams > 1)) {
+ for (unsigned i = 0; i < ctx->num_open_inodes; i++) {
if (ctx->open_inodes[i]->mft_no == inode->i_mft_no) {
- ni = ctx->open_inodes[i];
- break;
+ return ctx->open_inodes[i];
}
}
}
- if (!ni) {
- ni = ntfs_inode_open(ctx->vol, inode->i_mft_no);
- ctx->open_inodes[ctx->num_open_inodes++] = ni;
- inode->i_visited = 1;
- }
- if (!ni) {
+ ni = ntfs_inode_open(ctx->vol, inode->i_mft_no);
+ if (unlikely(!ni)) {
ERROR_WITH_ERRNO("Can't open \"%s\" in NTFS volume",
dentry_full_path(
inode_first_extraction_dentry(inode)));
return NULL;
}
+
+ ctx->open_inodes[ctx->num_open_inodes++] = ni;
return ni;
}
out_cleanup:
ntfs_3g_cleanup_blob_extract(ctx);
out:
- for (u32 i = 0; i < blob->out_refcnt; i++)
- targets[i].inode->i_visited = 0;
return ret;
}
}
for (u32 i = 0; i < ctx->num_reparse_inodes; i++) {
- struct wim_inode *inode = ctx->wim_reparse_inodes[i];
-
- complete_reparse_point(&ctx->rpbuf, inode, blob->size);
-
- if (ntfs_set_ntfs_reparse_data(ctx->ntfs_reparse_inodes[i],
- (const char *)&ctx->rpbuf,
- REPARSE_DATA_OFFSET + blob->size,
- 0))
- {
- ERROR_WITH_ERRNO("Failed to set reparse "
- "data on \"%s\"",
- dentry_full_path(
- inode_first_extraction_dentry(inode)));
- ret = WIMLIB_ERR_SET_REPARSE_DATA;
+ ret = ntfs_3g_restore_reparse_point(ctx->ntfs_reparse_inodes[i],
+ ctx->wim_reparse_inodes[i],
+ blob->size, ctx);
+ if (ret)
goto out;
- }
}
ret = 0;
out: