Merge 67fd3f173c into 52b0351a15

Fixes #35248.

man/journalctl.xml

@@ -475,7 +475,9 @@
         <term><option>--dmesg</option></term>
 
         <listitem><para>Show only kernel messages. This adds the match <literal>_TRANSPORT=kernel</literal>.
-        This implies <option>--boot=0</option> unless explicitly specified otherwise.</para>
+        This implies <option>--boot=0</option>, while the implication is overridden by specifying
+        <option>--boot=</option> with some boot specification, especially <option>--boot=all</option> will
+        disables the implication.</para>
 
         <xi:include href="version-info.xml" xpointer="v205"/></listitem>
       </varlistentry>
@@ -809,9 +811,11 @@
         <term><option>--pager-end</option></term>
 
         <listitem><para>Immediately jump to the end of the journal inside the implied pager tool. This
-        implies <option>--lines=1000</option> and <option>--boot=0</option> unless explicitly specified
-        otherwise, to guarantee that the pager will not buffer logs of unbounded size. Note that this option
-        is only supported for the
+        implies <option>--lines=1000</option> and <option>--boot=0</option> to guarantee that the pager will
+        not buffer logs of unbounded size. This may be overridden with an explicit <option>--lines=</option>
+        with some other numeric value and/or <option>--boot=</option> with some specific boot specification,
+        while <option>--lines=all</option> and <option>--boot=all</option> will disable the implications.
+        Note that this option is only supported for the
         <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         pager.</para>
 

src/basic/cgroup-util.c

@@ -803,10 +803,6 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                 if (!path)
                         return -ENOMEM;
 
-                /* Refuse cgroup paths from outside our cgroup namespace */
-                if (startswith(path, "/../"))
-                        return -EUNATCH;
-
                 /* Truncate suffix indicating the process is a zombie */
                 e = endswith(path, " (deleted)");
                 if (e)

src/basic/process-util.c

@@ -102,8 +102,8 @@ int pid_get_comm(pid_t pid, char **ret) {
         _cleanup_free_ char *escaped = NULL, *comm = NULL;
         int r;
 
-        assert(pid >= 0);
         assert(ret);
+        assert(pid >= 0);
 
         if (pid == 0 || pid == getpid_cached()) {
                 comm = new0(char, TASK_COMM_LEN + 1); /* Must fit in 16 byte according to prctl(2) */
@@ -143,9 +143,6 @@ int pidref_get_comm(const PidRef *pid, char **ret) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         r = pid_get_comm(pid->pid, &comm);
         if (r < 0)
                 return r;
@@ -292,9 +289,6 @@ int pidref_get_cmdline(const PidRef *pid, size_t max_columns, ProcessCmdlineFlag
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         r = pid_get_cmdline(pid->pid, max_columns, flags, &s);
         if (r < 0)
                 return r;
@@ -337,9 +331,6 @@ int pidref_get_cmdline_strv(const PidRef *pid, ProcessCmdlineFlags flags, char *
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         r = pid_get_cmdline_strv(pid->pid, flags, &args);
         if (r < 0)
                 return r;
@@ -486,9 +477,6 @@ int pidref_is_kernel_thread(const PidRef *pid) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         result = pid_is_kernel_thread(pid->pid);
         if (result < 0)
                 return result;
@@ -606,9 +594,6 @@ int pidref_get_uid(const PidRef *pid, uid_t *ret) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         r = pid_get_uid(pid->pid, &uid);
         if (r < 0)
                 return r;
@@ -809,9 +794,6 @@ int pidref_get_start_time(const PidRef *pid, usec_t *ret) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         r = pid_get_start_time(pid->pid, ret ? &t : NULL);
         if (r < 0)
                 return r;
@@ -1111,9 +1093,6 @@ int pidref_is_my_child(const PidRef *pid) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         result = pid_is_my_child(pid->pid);
         if (result < 0)
                 return result;
@@ -1149,9 +1128,6 @@ int pidref_is_unwaited(const PidRef *pid) {
         if (!pidref_is_set(pid))
                 return -ESRCH;
 
-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
         if (pid->pid == 1 || pidref_is_self(pid))
                 return true;
 
@@ -1193,9 +1169,6 @@ int pidref_is_alive(const PidRef *pidref) {
         if (!pidref_is_set(pidref))
                 return -ESRCH;
 
-        if (pidref_is_remote(pidref))
-                return -EREMOTE;
-
         result = pid_is_alive(pidref->pid);
         if (result < 0) {
                 assert(result != -ESRCH);

src/cryptenroll/cryptenroll-fido2.c

@@ -193,7 +193,7 @@ int enroll_fido2(
                 fflush(stdout);
 
                 fprintf(stderr,
-                        "\nPlease save this FIDO2 credential ID. It is required when unlocking the volume\n"
+                        "\nPlease save this FIDO2 credential ID. It is required when unloocking the volume\n"
                         "using the associated FIDO2 keyslot which we just created. To configure automatic\n"
                         "unlocking using this FIDO2 token, add an appropriate entry to your /etc/crypttab\n"
                         "file, see %s for details.\n", link);

src/journal/journalctl.c

@@ -990,7 +990,7 @@ static int parse_argv(int argc, char *argv[]) {
 
         if (arg_boot < 0)
                 /* Show the current boot if -f/--follow, -k/--dmesg, or -e/--pager-end is specified unless
-                 * -m/--merge is specified. */
+                 * -m/--merge is unspecified. */
                 arg_boot = !arg_merge && (arg_follow || arg_dmesg || FLAGS_SET(arg_pager_flags, PAGER_JUMP_TO_END));
         if (!arg_boot) {
                 /* Clear the boot ID and offset if -b/--boot is unspecified for safety. */

src/shared/killall.c

@@ -46,17 +46,13 @@ static bool argv_has_at(pid_t pid) {
         return c == '@';
 }
 
-static bool is_in_survivor_cgroup(const PidRef *pid) {
+static bool is_survivor_cgroup(const PidRef *pid) {
         _cleanup_free_ char *cgroup_path = NULL;
         int r;
 
         assert(pidref_is_set(pid));
 
         r = cg_pidref_get_path(/* root= */ NULL, pid, &cgroup_path);
-        if (r == -EUNATCH) {
-                log_warning_errno(r, "Process " PID_FMT " appears to originate in foreign namespace, ignoring.", pid->pid);
-                return true;
-        }
         if (r < 0) {
                 log_warning_errno(r, "Failed to get cgroup path of process " PID_FMT ", ignoring: %m", pid->pid);
                 return false;
@@ -90,7 +86,7 @@ static bool ignore_proc(const PidRef *pid, bool warn_rootfs) {
                 return true; /* also ignore processes where we can't determine this */
 
         /* Ignore processes that are part of a cgroup marked with the user.survive_final_kill_signal xattr */
-        if (is_in_survivor_cgroup(pid))
+        if (is_survivor_cgroup(pid))
                 return true;
 
         r = pidref_get_uid(pid, &uid);

src/test/test-audit-util.c

@@ -7,26 +7,24 @@ TEST(audit_loginuid_from_pid) {
         _cleanup_(pidref_done) PidRef self = PIDREF_NULL, pid1 = PIDREF_NULL;
         int r;
 
-        ASSERT_OK(pidref_set_self(&self));
-        ASSERT_OK(pidref_set_pid(&pid1, 1));
+        assert_se(pidref_set_self(&self) >= 0);
+        assert_se(pidref_set_pid(&pid1, 1) >= 0);
 
         uid_t uid;
         r = audit_loginuid_from_pid(&self, &uid);
-        if (r != -ENODATA)
-                ASSERT_OK(r);
+        assert_se(r >= 0 || r == -ENODATA);
         if (r >= 0)
                 log_info("self audit login uid: " UID_FMT, uid);
 
-        ASSERT_ERROR(audit_loginuid_from_pid(&pid1, &uid), ENODATA);
+        assert_se(audit_loginuid_from_pid(&pid1, &uid) == -ENODATA);
 
         uint32_t sessionid;
         r = audit_session_from_pid(&self, &sessionid);
-        if (r != -ENODATA)
-                ASSERT_OK(r);
+        assert_se(r >= 0 || r == -ENODATA);
         if (r >= 0)
                 log_info("self audit session id: %" PRIu32, sessionid);
 
-        ASSERT_ERROR(audit_session_from_pid(&pid1, &sessionid), ENODATA);
+        assert_se(audit_session_from_pid(&pid1, &sessionid) == -ENODATA);
 }
 
 static int intro(void) {