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

journald: rebreak some comments

Browse Source
This commit is contained in:
Lennart Poettering
2024-02-14 11:00:18 +01:00
parent 1f47e27a29
commit 296de3867c
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-native.c
+9 -14
View File
@@ -376,8 +376,8 @@ void server_process_native_file(
_cleanup_free_ char *k = NULL;
const char *e;
/* If this is not a sealed memfd, and the peer is unknown or
* unprivileged, then verify the path. */
/* If this is not a sealed memfd, and the peer is unknown or unprivileged, then verify the
* path. */
r = fd_get_path(fd, &k);
if (r < 0) {
@@ -437,8 +437,7 @@ void server_process_native_file(
return;
}
/* Refuse operating on file systems that have
* mandatory locking enabled, see:
/* Refuse operating on file systems that have mandatory locking enabled, see:
*
* https://github.com/systemd/systemd/issues/1822
*/
@@ -448,13 +447,10 @@ void server_process_native_file(
return;
}
/* Make the fd non-blocking. On regular files this has
* the effect of bypassing mandatory locking. Of
* course, this should normally not be necessary given
* the check above, but let's better be safe than
* sorry, after all NFS is pretty confusing regarding
* file system flags, and we better don't trust it,
* and so is SMB. */
/* Make the fd non-blocking. On regular files this has the effect of bypassing mandatory
* locking. Of course, this should normally not be necessary given the check above, but let's
* better be safe than sorry, after all NFS is pretty confusing regarding file system flags,
* and we better don't trust it, and so is SMB. */
r = fd_nonblock(fd, true);
if (r < 0) {
log_ratelimit_error_errno(r, JOURNAL_LOG_RATELIMIT,
@@ -462,9 +458,8 @@ void server_process_native_file(
return;
}
/* The file is not sealed, we can't map the file here, since
* clients might then truncate it and trigger a SIGBUS for
* us. So let's stupidly read it. */
/* The file is not sealed, we can't map the file here, since clients might then truncate it
* and trigger a SIGBUS for us. So let's stupidly read it. */
p = malloc(st.st_size);
if (!p) {