SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file-io: Fix copying sparse files

Browse Source 
This change makes sure a data copy using copy_bytes() does not exceed the
max_bytes value when using COPY_HOLES and max_bytes stops before the next
data section.
This commit is contained in:
Michael A Cassaniti
2023-08-11 14:30:54 +02:00
committed by Daan De Meyer
parent e868f5efae
commit c2dfcbd48e
2 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/copy.c
+14 -1
View File
@@ -275,9 +275,22 @@ int copy_bytes_full(
/* If we're in a hole (current offset is not a data offset), create a hole of the
* same size in the target file. */
if (e > c) {
r = create_hole(fdt, e - c);
/* Make sure our new hole doesn't go over the maximum size we're allowed to copy. */
n = MIN(max_bytes, (uint64_t) e - c);
r = create_hole(fdt, n);
if (r < 0)
return r;
/* Make sure holes are taken into account in the maximum size we're supposed to copy. */
if (max_bytes != UINT64_MAX) {
max_bytes -= n;
if (max_bytes <= 0)
break;
}
/* Update the size we're supposed to copy in this iteration if needed. */
if (m > max_bytes)
m = max_bytes;
}
c = e; /* Set c to the start of the data segment. */