From 7180a3b38ca4c167ab2df12bec02058878f8142c Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 20 Jan 2025 09:01:37 +0100 Subject: [PATCH 1/2] sbsign: Make two debug logs into error logs --- src/sbsign/sbsign.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c index 92b82842198..a45f3ad6ee4 100644 --- a/src/sbsign/sbsign.c +++ b/src/sbsign/sbsign.c @@ -243,11 +243,11 @@ static int verb_sign(int argc, char *argv[], void *userdata) { struct stat st; if (fstat(srcfd, &st) < 0) - return log_debug_errno(errno, "Failed to stat %s: %m", argv[1]); + return log_error_errno(errno, "Failed to stat %s: %m", argv[1]); r = stat_verify_regular(&st); if (r < 0) - return log_debug_errno(r, "%s is not a regular file: %m", argv[1]); + return log_error_errno(r, "%s is not a regular file: %m", argv[1]); _cleanup_(unlink_and_freep) char *tmp = NULL; _cleanup_close_ int dstfd = open_tmpfile_linkable(arg_output, O_RDWR|O_CLOEXEC, &tmp); From 6f594acd632f61fde4b1c33bfcab3954ec304e8a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 19 Jan 2025 22:48:21 +0100 Subject: [PATCH 2/2] sbsign: Make sure output file mode respects umask --- src/sbsign/sbsign.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c index a45f3ad6ee4..a7e4047054c 100644 --- a/src/sbsign/sbsign.c +++ b/src/sbsign/sbsign.c @@ -254,6 +254,10 @@ static int verb_sign(int argc, char *argv[], void *userdata) { if (dstfd < 0) return log_error_errno(r, "Failed to open temporary file: %m"); + r = fchmod_umask(dstfd, 0666); + if (r < 0) + log_debug_errno(r, "Failed to change temporary file mode: %m"); + r = copy_bytes(srcfd, dstfd, UINT64_MAX, COPY_REFLINK); if (r < 0) return log_error_errno(r, "Failed to copy %s to %s: %m", argv[1], tmp);