morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26855 from DaanDeMeyer/repart-fixes

Browse Source 
Repart fixes
This commit is contained in:
Yu Watanabe
2023-03-18 15:03:38 +09:00
committed by GitHub
parent 6c2caf5053 e21be7976a
commit 1f3792bfca
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/partition/repart.c
View File

@@ -3263,9 +3263,22 @@ static int partition_target_sync(Context *context, Partition *p, PartitionTarget
if (r < 0)
return log_error_errno(r, "Failed to sync loopback device: %m");
} else if (t->fd >= 0) {
struct stat st;
if (lseek(whole_fd, p->offset, SEEK_SET) == (off_t) -1)
return log_error_errno(errno, "Failed to seek to partition offset: %m");
if (lseek(t->fd, 0, SEEK_SET) == (off_t) -1)
return log_error_errno(errno, "Failed to seek to start of temporary file: %m");
if (fstat(t->fd, &st) < 0)
return log_error_errno(errno, "Failed to stat temporary file: %m");
if (st.st_size > (off_t) p->new_size)
return log_error_errno(SYNTHETIC_ERRNO(ENOSPC),
"Partition %" PRIu64 "'s contents (%s) don't fit in the partition (%s)",
p->partno, FORMAT_BYTES(st.st_size), FORMAT_BYTES(p->new_size));
r = copy_bytes(t->fd, whole_fd, UINT64_MAX, COPY_REFLINK|COPY_HOLES|COPY_FSYNC);
if (r < 0)
return log_error_errno(r, "Failed to copy bytes to partition: %m");
@@ -3550,6 +3563,8 @@ static int partition_format_verity_hash(
if (r < 0)
return log_error_errno(r, "Failed to allocate libcryptsetup context: %m");
cryptsetup_enable_logging(cd);
r = sym_crypt_format(
cd, CRYPT_VERITY, NULL, NULL, NULL, NULL, 0,
&(struct crypt_params_verity){
@@ -3561,8 +3576,17 @@ static int partition_format_verity_hash(
.hash_block_size = context->sector_size,
.salt_size = 32,
});
if (r < 0)
if (r < 0) {
/* libcryptsetup reports non-descriptive EIO errors for every I/O failure. Luckily, it
* doesn't clobber errno so let's check for ENOSPC so we can report a better error if the
* partition is too small. */
if (r == -EIO && errno == ENOSPC)
return log_error_errno(errno,
"Verity hash data does not fit in partition %"PRIu64" with size %s",
p->partno, FORMAT_BYTES(p->new_size));
return log_error_errno(r, "Failed to setup verity hash data: %m");
}
r = partition_target_sync(context, p, t);
if (r < 0)
@@ -3653,7 +3677,7 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
_cleanup_free_ char *text = NULL;
Partition *hp;
uint8_t fp[X509_FINGERPRINT_SIZE];
size_t sigsz = 0, padsz; /* avoid false maybe-uninitialized warning */
size_t sigsz = 0; /* avoid false maybe-uninitialized warning */
int whole_fd, r;
assert(p->verity == VERITY_SIG);
@@ -3699,17 +3723,14 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
if (r < 0)
return log_error_errno(r, "Failed to format JSON object: %m");
padsz = round_up_size(strlen(text), 4096);
assert_se(padsz <= p->new_size);
r = strgrowpad0(&text, padsz);
r = strgrowpad0(&text, p->new_size);
if (r < 0)
return log_error_errno(r, "Failed to pad string to %s", FORMAT_BYTES(padsz));
return log_error_errno(r, "Failed to pad string to %s", FORMAT_BYTES(p->new_size));
if (lseek(whole_fd, p->offset, SEEK_SET) == (off_t) -1)
return log_error_errno(errno, "Failed to seek to partition offset: %m");
r = loop_write(whole_fd, text, padsz, /*do_poll=*/ false);
r = loop_write(whole_fd, text, p->new_size, /*do_poll=*/ false);
if (r < 0)
return log_error_errno(r, "Failed to write verity signature to partition: %m");