X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=f447468eb6b044a91cb3ab72c7232ec0bcac86ad;hp=7f4f2bb4c2858c26ad313a7882e330b13229bc80;hb=78da4e026457e507e0d4fc930dcfe2855075dc11;hpb=f3e97b29c4a8c564d54b0fd11cd43a9b4cd6a8ad diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 7f4f2bb4..f447468e 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -58,6 +58,22 @@ attr_record_name(ATTR_RECORD *ar) return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset)); } +static ntfs_attr * +open_ntfs_attr(ntfs_inode *ni, struct ntfs_location *loc) +{ + ntfs_attr *na; + + na = ntfs_attr_open(ni, + loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA, + loc->stream_name, + loc->stream_name_nchars); + if (!na) { + ERROR_WITH_ERRNO("Failed to open attribute of \"%"TS"\" in " + "NTFS volume", loc->path); + } + return na; +} + int read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, @@ -66,7 +82,7 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, int _ignored_flags) { struct ntfs_location *loc = lte->ntfs_loc; - ntfs_volume *vol = *loc->ntfs_vol_p; + ntfs_volume *vol = loc->ntfs_vol; ntfs_inode *ni; ntfs_attr *na; s64 pos; @@ -81,32 +97,18 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, goto out; } - na = ntfs_attr_open(ni, - loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA, - loc->stream_name, - loc->stream_name_nchars); + na = open_ntfs_attr(ni, loc); if (!na) { - ERROR_WITH_ERRNO("Failed to open attribute of \"%"TS"\" in " - "NTFS volume", loc->path); ret = WIMLIB_ERR_NTFS_3G; goto out_close_ntfs_inode; } - /*if (is_reparse_point) {*/ - /*if (ntfs_attr_pread(na, 0, 8, buf) != 8)*/ - /*goto out_error;*/ - /**reparse_tag_ret = le32_to_cpu(*(u32*)buf);*/ - /*DEBUG("ReparseTag = %#x", *reparse_tag_ret);*/ - /*pos = 8;*/ - /*bytes_remaining -= 8;*/ - /*}*/ - if (cb) out_buf = alloca(WIM_CHUNK_SIZE); else out_buf = ctx_or_buf; - pos = 0; - bytes_remaining = na->data_size; + pos = (loc->is_reparse_point) ? 8 : 0; + bytes_remaining = size; while (bytes_remaining) { s64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); if (ntfs_attr_pread(na, pos, to_read, out_buf) != to_read) { @@ -133,6 +135,35 @@ out: return ret; } +static int +read_reparse_tag(ntfs_inode *ni, struct ntfs_location *loc, + u32 *reparse_tag_ret) +{ + int ret; + u8 buf[8]; + ntfs_attr *na; + + na = open_ntfs_attr(ni, loc); + if (!na) { + ret = WIMLIB_ERR_NTFS_3G; + goto out; + } + + if (ntfs_attr_pread(na, 0, 8, buf) != 8) { + ERROR_WITH_ERRNO("Error reading reparse data"); + ret = WIMLIB_ERR_NTFS_3G; + goto out_close_ntfs_attr; + } + *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + DEBUG("ReparseTag = %#x", *reparse_tag_ret); + ret = 0; +out_close_ntfs_attr: + ntfs_attr_close(na); +out: + return ret; + +} + /* Load the streams from a file or reparse point in the NTFS volume into the WIM * lookup table */ static int @@ -141,12 +172,12 @@ capture_ntfs_streams(struct wim_inode *inode, char *path, size_t path_len, struct wim_lookup_table *lookup_table, - ntfs_volume **ntfs_vol_p, + ntfs_volume *vol, ATTR_TYPES type) { ntfs_attr_search_ctx *actx; - struct ntfs_location *ntfs_loc = NULL; - int ret = 0; + struct ntfs_location *ntfs_loc; + int ret; struct wim_lookup_table_entry *lte; DEBUG2("Capturing NTFS data streams from `%s'", path); @@ -165,29 +196,31 @@ capture_ntfs_streams(struct wim_inode *inode, { u64 data_size = ntfs_get_attribute_value_length(actx->attr); u64 name_length = actx->attr->name_length; - struct wim_lookup_table_entry **back_ptr; + u32 stream_id; + if (data_size == 0) { - if (errno != 0) { - ERROR_WITH_ERRNO("Failed to get size of attribute of " - "`%s'", path); - ret = WIMLIB_ERR_NTFS_3G; - goto out_put_actx; - } /* Empty stream. No lookup table entry is needed. */ lte = NULL; + ntfs_loc = NULL; } else { ntfs_loc = CALLOC(1, sizeof(*ntfs_loc)); - if (!ntfs_loc) + if (!ntfs_loc) { + ret = WIMLIB_ERR_NOMEM; goto out_put_actx; - ntfs_loc->ntfs_vol_p = ntfs_vol_p; + } + ntfs_loc->ntfs_vol = vol; ntfs_loc->path = MALLOC(path_len + 1); - if (!ntfs_loc->path) + if (!ntfs_loc->path) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; + } memcpy(ntfs_loc->path, path, path_len + 1); if (name_length) { ntfs_loc->stream_name = MALLOC(name_length * 2); - if (!ntfs_loc->stream_name) + if (!ntfs_loc->stream_name) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; + } memcpy(ntfs_loc->stream_name, attr_record_name(actx->attr), actx->attr->name_length * 2); @@ -195,25 +228,30 @@ capture_ntfs_streams(struct wim_inode *inode, } lte = new_lookup_table_entry(); - if (!lte) + if (!lte) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; - lte->ntfs_loc = ntfs_loc; + } lte->resource_location = RESOURCE_IN_NTFS_VOLUME; - #if 0 + lte->ntfs_loc = ntfs_loc; + ntfs_loc = NULL; if (type == AT_REPARSE_POINT) { - ntfs_loc->is_reparse_point = true; + if (data_size < 8) { + ERROR("Invalid reparse data (only %u bytes)!", + (unsigned)data_size); + ret = WIMLIB_ERR_NTFS_3G; + goto out_free_lte; + } + lte->ntfs_loc->is_reparse_point = true; lte->resource_entry.original_size = data_size - 8; - lte->resource_entry.size = data_size - 8; + ret = read_reparse_tag(ni, lte->ntfs_loc, + &inode->i_reparse_tag); + if (ret) + goto out_free_lte; } else { - ntfs_loc->is_reparse_point = false; + lte->ntfs_loc->is_reparse_point = false; lte->resource_entry.original_size = data_size; - lte->resource_entry.size = data_size; } - #else - ntfs_loc->is_reparse_point = (type == AT_REPARSE_POINT); - lte->resource_entry.original_size = data_size; - #endif - ntfs_loc = NULL; } if (name_length == 0) { /* Unnamed data stream. Put the reference to it in the @@ -224,7 +262,8 @@ capture_ntfs_streams(struct wim_inode *inode, ret = WIMLIB_ERR_NTFS_3G; goto out_free_lte; } - back_ptr = &inode->i_lte; + stream_id = 0; + inode->i_lte = lte; } else { /* Named data stream. Put the reference to it in the * alternate data stream entries */ @@ -233,14 +272,26 @@ capture_ntfs_streams(struct wim_inode *inode, new_ads_entry = inode_add_ads_utf16le(inode, attr_record_name(actx->attr), name_length * 2); - if (!new_ads_entry) + if (!new_ads_entry) { + ret = WIMLIB_ERR_NOMEM; goto out_free_lte; + } wimlib_assert(new_ads_entry->stream_name_nbytes == name_length * 2); - back_ptr = &new_ads_entry->lte; + stream_id = new_ads_entry->stream_id; + new_ads_entry->lte = lte; + } + if (lte) { + lookup_table_insert_unhashed(lookup_table, lte, + inode, stream_id); } - lookup_table_insert_unhashed(lookup_table, lte, back_ptr); } - ret = 0; + if (errno == ENOENT) { + ret = 0; + } else { + ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'", + path); + ret = WIMLIB_ERR_NTFS_3G; + } goto out_put_actx; out_free_lte: free_lookup_table_entry(lte); @@ -255,7 +306,7 @@ out_put_actx: if (ret == 0) DEBUG2("Successfully captured NTFS streams from `%s'", path); else - ERROR("Failed to capture NTFS streams from `%s", path); + ERROR("Failed to capture NTFS streams from `%s'", path); return ret; } @@ -395,7 +446,7 @@ struct readdir_ctx { struct sd_set *sd_set; struct dos_name_map *dos_name_map; const struct wimlib_capture_config *config; - ntfs_volume **ntfs_vol_p; + ntfs_volume *vol; int add_image_flags; wimlib_progress_func_t progress_func; }; @@ -411,7 +462,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, struct wim_inode_table *inode_table, struct sd_set *sd_set, const struct wimlib_capture_config *config, - ntfs_volume **ntfs_vol_p, + ntfs_volume *ntfs_vol, int add_image_flags, wimlib_progress_func_t progress_func); @@ -475,7 +526,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ctx->lookup_table, ctx->inode_table, ctx->sd_set, - ctx->config, ctx->ntfs_vol_p, + ctx->config, ctx->vol, ctx->add_image_flags, ctx->progress_func); if (child) @@ -502,7 +553,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, struct wim_inode_table *inode_table, struct sd_set *sd_set, const struct wimlib_capture_config *config, - ntfs_volume **ntfs_vol_p, + ntfs_volume *vol, int add_image_flags, wimlib_progress_func_t progress_func) { @@ -510,6 +561,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, int ret; struct wim_dentry *root; struct wim_inode *inode; + ATTR_TYPES stream_type; if (exclude_path(path, path_len, config, false)) { /* Exclude a file or directory tree based on the capture @@ -530,7 +582,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, /* Get file attributes */ struct SECURITY_CONTEXT ctx; memset(&ctx, 0, sizeof(ctx)); - ctx.vol = ni->vol; + ctx.vol = vol; ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ATTRIB, ni, dir_ni, (char *)&attributes, sizeof(u32)); @@ -563,7 +615,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (inode->i_nlink > 1) /* Shared inode; nothing more to do */ goto out; - if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name */ + if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */ root->is_win32_name = 1; inode->i_creation_time = le64_to_cpu(ni->creation_time); inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time); @@ -571,14 +623,26 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, inode->i_attributes = le32_to_cpu(attributes); inode->i_resolved = 1; - if (attributes & FILE_ATTR_REPARSE_POINT) { - /* Junction point, symbolic link, or other reparse point */ - ret = capture_ntfs_streams(inode, ni, path, - path_len, lookup_table, - ntfs_vol_p, AT_REPARSE_POINT); - } else if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { + if (attributes & FILE_ATTR_REPARSE_POINT) + stream_type = AT_REPARSE_POINT; + else + stream_type = AT_DATA; + + /* Capture the file's streams; more specifically, this is supposed to: + * + * - Regular files: capture unnamed data stream and any named data + * streams + * - Directories: capture any named data streams + * - Reparse points: capture reparse data only + */ + ret = capture_ntfs_streams(inode, ni, path, path_len, lookup_table, + vol, stream_type); + if (ret) + goto out; - /* Normal directory */ + if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { + + /* Recurse to directory children */ s64 pos = 0; struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} }; struct readdir_ctx ctx = { @@ -591,7 +655,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, .sd_set = sd_set, .dos_name_map = &dos_name_map, .config = config, - .ntfs_vol_p = ntfs_vol_p, + .vol = vol, .add_image_flags = add_image_flags, .progress_func = progress_func, }; @@ -604,14 +668,9 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, &dos_name_map); } destroy_dos_name_map(&dos_name_map); - } else { - /* Normal file */ - ret = capture_ntfs_streams(inode, ni, path, - path_len, lookup_table, - ntfs_vol_p, AT_DATA); + if (ret) + goto out; } - if (ret) - goto out; if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) { /* Get security descriptor */ @@ -653,6 +712,17 @@ out: return ret; } + +int +do_ntfs_umount(struct _ntfs_volume *vol) +{ + DEBUG("Unmounting NTFS volume"); + if (ntfs_umount(vol, FALSE)) + return WIMLIB_ERR_NTFS_3G; + else + return 0; +} + int build_dentry_tree_ntfs(struct wim_dentry **root_p, const char *device, @@ -667,7 +737,6 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, ntfs_volume *vol; ntfs_inode *root_ni; int ret; - ntfs_volume **ntfs_vol_p = extra_arg; DEBUG("Mounting NTFS volume `%s' read-only", device); @@ -714,7 +783,7 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, FILE_NAME_POSIX, lookup_table, inode_table, sd_set, - config, ntfs_vol_p, + config, vol, add_image_flags, progress_func); out_cleanup: @@ -726,7 +795,7 @@ out: ntfs_inode_close(vol->secure_ni); if (ret) { - if (ntfs_umount(vol, FALSE) != 0) { + if (do_ntfs_umount(vol)) { ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device); if (ret == 0) @@ -735,7 +804,7 @@ out: } else { /* We need to leave the NTFS volume mounted so that we can read * the NTFS files again when we are actually writing the WIM */ - *ntfs_vol_p = vol; + *(ntfs_volume**)extra_arg = vol; } return ret; }