Merge pull request #19766 from keszybz/fuzz-fixes

Fuzz fixes

man/systemd-tty-ask-password-agent.xml

@@ -92,11 +92,11 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--console</option></term>
+        <term><option>--console</option><optional>=<replaceable>DEVICE</replaceable></optional></term>
 
-        <listitem><para>Ask question on
+        <listitem><para>Ask question on TTY <replaceable>DEVICE</replaceable> instead of querying the user on
-        <filename>/dev/console</filename> instead of querying the user
+        the calling TTY. If <replaceable>DEVICE</replaceable> is not specified,
-        on the calling TTY. </para></listitem>
+        <filename>/dev/console</filename> will be used.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />

src/basic/alloc-util.h

@@ -79,6 +79,13 @@ void* memdup_suffix0(const void *p, size_t l); /* We can't use _alloc_() here, s
                 memcpy_safe(_q_, p, _l_);       \
         })
 
+static inline void unsetp(void *p) {
+        /* A trivial "destructor" that can be used in cases where we want to
+         * unset a pointer from a _cleanup_ function. */
+
+        *(void**)p = NULL;
+}
+
 static inline void freep(void *p) {
         *(void**)p = mfree(*(void**) p);
 }

src/core/main.c

@@ -1999,7 +1999,7 @@ static void log_execution_mode(bool *ret_first_boot) {
         if (arg_system) {
                 int v;
 
-                log_info("systemd " GIT_VERSION " running in %ssystem mode. (%s)",
+                log_info("systemd " GIT_VERSION " running in %ssystem mode (%s)",
                          arg_action == ACTION_TEST ? "test " : "",
                          systemd_features);
 

src/journal-remote/fuzz-journal-remote.c

@@ -28,7 +28,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
                 return 0;
 
         if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+                log_set_max_level(LOG_ERR);
 
         fdin = memfd_new_and_map("fuzz-journal-remote", size, &mem);
         if (fdin < 0)
@@ -66,6 +66,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         r = sd_journal_open_files(&j, (const char**) STRV_MAKE(name), 0);
         if (r < 0) {
+                log_error_errno(r, "sd_journal_open_files([\"%s\"]) failed: %m", name);
                 assert_se(IN_SET(r, -ENOMEM, -EMFILE, -ENFILE));
                 return r;
         }

src/journal-remote/journal-remote-parse.c

@@ -74,7 +74,7 @@ int process_source(RemoteSource *source, bool compress, bool seal) {
                          &source->importer.boot_id,
                          compress, seal);
         if (r == -EBADMSG) {
-                log_error_errno(r, "Entry is invalid, ignoring.");
+                log_warning_errno(r, "Entry is invalid, ignoring.");
                 r = 0;
         } else if (r < 0)
                 log_error_errno(r, "Failed to write entry of %zu bytes: %m",

src/shared/journal-importer.c

@@ -69,9 +69,9 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) {
 
                 imp->scanned = imp->filled;
                 if (imp->scanned >= DATA_SIZE_MAX)
-                        return log_error_errno(SYNTHETIC_ERRNO(ENOBUFS),
+                        return log_warning_errno(SYNTHETIC_ERRNO(ENOBUFS),
-                                               "Entry is bigger than %u bytes.",
+                                                 "Entry is bigger than %u bytes.",
-                                               DATA_SIZE_MAX);
+                                                 DATA_SIZE_MAX);
 
                 if (imp->passive_fd)
                         /* we have to wait for some data to come to us */
@@ -163,9 +163,9 @@ static int get_data_size(JournalImporter *imp) {
 
         imp->data_size = unaligned_read_le64(data);
         if (imp->data_size > DATA_SIZE_MAX)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Stream declares field with size %zu > DATA_SIZE_MAX = %u",
+                                         "Stream declares field with size %zu > DATA_SIZE_MAX = %u",
-                                       imp->data_size, DATA_SIZE_MAX);
+                                         imp->data_size, DATA_SIZE_MAX);
         if (imp->data_size == 0)
                 log_warning("Binary field with zero length");
 
@@ -203,8 +203,8 @@ static int get_data_newline(JournalImporter *imp) {
                 int l;
 
                 l = cescape_char(*data, buf);
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Expected newline, got '%.*s'", l, buf);
+                                         "Expected newline, got '%.*s'", l, buf);
         }
 
         return 1;

src/systemctl/systemctl-kill.c

@@ -22,7 +22,7 @@ int kill_unit(int argc, char *argv[], void *userdata) {
                 arg_kill_who = "all";
 
         /* --fail was specified */
-        if (streq(arg_job_mode, "fail"))
+        if (streq(arg_job_mode(), "fail"))
                 kill_who = strjoina(arg_kill_who, "-fail");
 
         r = expand_unit_names(bus, strv_skip(argv, 1), NULL, &names, NULL);

src/systemctl/systemctl-start-unit.c

@@ -306,7 +306,7 @@ int start_unit(int argc, char *argv[], void *userdata) {
                                 /* A command in style of "systemctl start <unit1> <unit2> …", "sysemctl stop <unit1> <unit2> …" and so on */
                                 method = verb_to_method(argv[0]);
                                 job_type = verb_to_job_type(argv[0]);
-                                mode = arg_job_mode;
+                                mode = arg_job_mode();
                         } else
                                 method = job_type = mode = NULL;
 

src/systemctl/systemctl.c

@@ -65,7 +65,7 @@ char **arg_states = NULL;
 char **arg_properties = NULL;
 bool arg_all = false;
 enum dependency arg_dependency = DEPENDENCY_FORWARD;
-const char *arg_job_mode = "replace";
+const char *_arg_job_mode = NULL;
 UnitFileScope arg_scope = UNIT_FILE_SYSTEM;
 bool arg_wait = false;
 bool arg_no_block = false;
@@ -112,11 +112,16 @@ bool arg_read_only = false;
 bool arg_mkdir = false;
 bool arg_marked = false;
 
-STATIC_DESTRUCTOR_REGISTER(arg_wall, strv_freep);
-STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_types, strv_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_states, strv_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_properties, strv_freep);
+STATIC_DESTRUCTOR_REGISTER(_arg_job_mode, unsetp);
+STATIC_DESTRUCTOR_REGISTER(arg_wall, strv_freep);
+STATIC_DESTRUCTOR_REGISTER(arg_kill_who, unsetp);
+STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
+STATIC_DESTRUCTOR_REGISTER(arg_reboot_argument, unsetp);
+STATIC_DESTRUCTOR_REGISTER(arg_host, unsetp);
+STATIC_DESTRUCTOR_REGISTER(arg_boot_loader_entry, unsetp);
 STATIC_DESTRUCTOR_REGISTER(arg_clean_what, strv_freep);
 
 static int systemctl_help(void) {
@@ -598,19 +603,19 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JOB_MODE:
-                        arg_job_mode = optarg;
+                        _arg_job_mode = optarg;
                         break;
 
                 case ARG_FAIL:
-                        arg_job_mode = "fail";
+                        _arg_job_mode = "fail";
                         break;
 
                 case ARG_IRREVERSIBLE:
-                        arg_job_mode = "replace-irreversibly";
+                        _arg_job_mode = "replace-irreversibly";
                         break;
 
                 case ARG_IGNORE_DEPENDENCIES:
-                        arg_job_mode = "ignore-dependencies";
+                        _arg_job_mode = "ignore-dependencies";
                         break;
 
                 case ARG_USER:

src/systemctl/systemctl.h

@@ -49,7 +49,7 @@ extern char **arg_states;
 extern char **arg_properties;
 extern bool arg_all;
 extern enum dependency arg_dependency;
-extern const char *arg_job_mode;
+extern const char *_arg_job_mode;
 extern UnitFileScope arg_scope;
 extern bool arg_wait;
 extern bool arg_no_block;
@@ -96,4 +96,8 @@ extern bool arg_read_only;
 extern bool arg_mkdir;
 extern bool arg_marked;
 
+static inline const char* arg_job_mode(void) {
+        return _arg_job_mode ?: "replace";
+}
+
 int systemctl_dispatch_parse_argv(int argc, char *argv[]);

src/tty-ask-password-agent/tty-ask-password-agent.c

@@ -143,10 +143,9 @@ static int agent_ask_password_tty(
                 char ***ret) {
 
         int tty_fd = -1, r;
+        const char *con = arg_device ?: "/dev/console";
 
         if (arg_console) {
-                const char *con = arg_device ?: "/dev/console";
-
                 tty_fd = acquire_terminal(con, ACQUIRE_TERMINAL_WAIT, USEC_INFINITY);
                 if (tty_fd < 0)
                         return log_error_errno(tty_fd, "Failed to acquire %s: %m", con);
@@ -155,6 +154,7 @@ static int agent_ask_password_tty(
                 if (r < 0)
                         log_warning_errno(r, "Failed to reset terminal, ignoring: %m");
 
+                log_info("Starting password query on %s.", con);
         }
 
         r = ask_password_tty(tty_fd, message, NULL, until, flags, flag_file, ret);
@@ -162,6 +162,9 @@ static int agent_ask_password_tty(
         if (arg_console) {
                 tty_fd = safe_close(tty_fd);
                 release_terminal();
+
+                if (r >= 0)
+                        log_info("Password query on %s finished successfully.", con);
         }
 
         return r;
@@ -411,17 +414,20 @@ static int help(void) {
                 return log_oom();
 
         printf("%s [OPTIONS...]\n\n"
-               "Process system password requests.\n\n"
+               "%sProcess system password requests.%s\n\n"
-               "  -h --help     Show this help\n"
+               "  -h --help              Show this help\n"
-               "     --version  Show package version\n"
+               "     --version           Show package version\n"
-               "     --list     Show pending password requests\n"
+               "     --list              Show pending password requests\n"
-               "     --query    Process pending password requests\n"
+               "     --query             Process pending password requests\n"
-               "     --watch    Continuously process password requests\n"
+               "     --watch             Continuously process password requests\n"
-               "     --wall     Continuously forward password requests to wall\n"
+               "     --wall              Continuously forward password requests to wall\n"
-               "     --plymouth Ask question with Plymouth instead of on TTY\n"
+               "     --plymouth          Ask question with Plymouth instead of on TTY\n"
-               "     --console  Ask question on /dev/console instead of current TTY\n"
+               "     --console[=DEVICE]  Ask question on /dev/console (or DEVICE if specified)\n"
+               "                         instead of the current TTY\n"
                "\nSee the %s for details.\n",
                program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
                link);
 
         return 0;

src/udev/udevadm-trigger.c

@@ -109,7 +109,7 @@ static int exec_list(
 
                 /* If the user asked for it, write event UUID to stdout */
                 if (arg_uuid)
-                        printf(SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(id));
+                        printf(SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(id));
 
                 if (settle_hashmap) {
                         _cleanup_free_ sd_id128_t *mid = NULL;
@@ -175,7 +175,7 @@ static int device_monitor_handler(sd_device_monitor *m, sd_device *dev, void *us
                 printf("settle %s\n", syspath);
 
         if (arg_uuid)
-                printf("settle " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(*settle_id));
+                printf("settle " SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(*settle_id));
 
         free(hashmap_remove(settle_hashmap, syspath));
         free(k);