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

pcrlock: use WRITE_STRING_FILE_LABEL

Browse Source 
Fixes #38727.
This commit is contained in:
Yu Watanabe
2025-08-27 01:31:36 +09:00
committed by Zbigniew Jędrzejewski-Szmek
parent cbbed2bd44
commit 9507e118e9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pcrlock/pcrlock.c
View File

@@ -34,6 +34,7 @@
#include "hexdecoct.h"
#include "initrd-util.h"
#include "json-util.h"
#include "label-util.h"
#include "list.h"
#include "main-func.h"
#include "mkdir-label.h"
@@ -4414,7 +4415,7 @@ static int write_boot_policy_file(const char *json_text) {
AT_FDCWD,
boot_policy_file,
&encoded,
WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_SYNC|WRITE_STRING_FILE_MKDIR_0755);
WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_SYNC|WRITE_STRING_FILE_MKDIR_0755|WRITE_STRING_FILE_LABEL);
if (r < 0)
return log_error_errno(r, "Failed to write boot policy file to '%s': %m", boot_policy_file);
@@ -4831,7 +4832,7 @@ static int make_policy(bool force, RecoveryPinMode recovery_pin_mode) {
return log_error_errno(r, "Failed to format new configuration to JSON: %m");
const char *path = arg_policy_path ?: (in_initrd() ? "/run/systemd/pcrlock.json" : "/var/lib/systemd/pcrlock.json");
r = write_string_file(path, text, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_SYNC|WRITE_STRING_FILE_MKDIR_0755);
r = write_string_file(path, text, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_SYNC|WRITE_STRING_FILE_MKDIR_0755|WRITE_STRING_FILE_LABEL);
if (r < 0)
return log_error_errno(r, "Failed to write new configuration to '%s': %m", path);
@@ -5428,6 +5429,10 @@ static int run(int argc, char *argv[]) {
log_setup();
r = mac_init();
if (r < 0)
return r;
r = parse_argv(argc, argv);
if (r <= 0)
return r;