Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tar/export: Fix error with zero-sized hardlinked files #1078

Merged
merged 2 commits into from
Feb 5, 2025
Merged

tar/export: Fix error with zero-sized hardlinked files #1078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c523b4
tar/export: Add error context
cgwalters Feb 5, 2025
0b04cc4
tar/export: Fix error with zero-sized hardlinked files
cgwalters Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ostree-ext/src/tar/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,11 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
let mode = meta.attribute_uint32("unix::mode");
h.set_mode(self.filter_mode(mode));
if instream.is_some() {
h.set_entry_type(tar::EntryType::Regular);
h.set_size(meta.size() as u64);
} else {
h.set_entry_type(tar::EntryType::Symlink);
h.set_size(0);
}
if !self.wrote_content.contains(checksum) {
let inserted = self.wrote_content.insert(checksum.to_string());
Expand All @@ -445,8 +449,6 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
if let Some(instream) = instream {
ensure!(meta.file_type() == gio::FileType::Regular);

h.set_entry_type(tar::EntryType::Regular);
h.set_size(meta.size() as u64);
let mut instream = BufReader::with_capacity(BUF_CAPACITY, instream.into_read());
self.out
.append_data(&mut h, &path, &mut instream)
Expand All @@ -461,8 +463,6 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
.to_str()
.ok_or_else(|| anyhow!("Invalid UTF-8 symlink target: {target:?}"))?;
let context = || format!("Writing content symlink: {}", checksum);
h.set_entry_type(tar::EntryType::Symlink);
h.set_size(0);
// Handle //chkconfig, see above
if symlink_is_denormal(target) {
h.set_link_name_literal(target).with_context(context)?;
Expand Down Expand Up @@ -501,15 +501,20 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
mut h: tar::Header,
dest: &Utf8Path,
) -> Result<()> {
// Query the original size first
let size = h.size().context("Querying size for hardlink append")?;
// Don't create hardlinks to zero-sized files, it's much more likely
// to result in generated tar streams from container builds resulting
// in a modified linked-to file in /sysroot, which we don't currently handle.
// And in the case where the input is *not* zero sized, we still output
// a hardlink of size zero, as this is what is normal.
let is_regular_zerosized = if h.entry_type() == tar::EntryType::Regular {
let size = h.size().context("Querying size for hardlink append")?;
size == 0
} else {
false
};
// Link sizes shoud always be zero
h.set_size(0);
if h.entry_type() == tar::EntryType::Regular && size == 0 {
if is_regular_zerosized {
self.out.append_data(&mut h, dest, &mut std::io::empty())?;
} else {
h.set_entry_type(tar::EntryType::Link);
Expand Down Expand Up @@ -549,7 +554,8 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
let (objpath, h) = self.append_content(checksum)?;
let subpath = &dirpath.join(name);
let subpath = map_path(subpath);
self.append_content_hardlink(&objpath, h, &subpath)?;
self.append_content_hardlink(&objpath, h, &subpath)
.with_context(|| format!("Hardlinking {checksum} to {subpath}"))?;
}
}

Expand Down