uuidd: don't truncate long socket paths

This was the error
  uuidd: couldn't bind unix socket /var/tmp/portage/sys-apps/util-linux-2.31.1/work/util-linux-2.31.1-abi_x86_64.amd64/tests/output/uuid/uuiddkOcTUuoZ7kaP3: Address already in use

because the socket path was truncated to 108 chars which was luckily
an existing directory.

Now we abort early with "uuidd: socket name too long: ... "

Reported-by: Thomas Deutschmann <whissi@gentoo.org>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index e7c25cfa1f932ee7b08a6728e8882ca26b0d422b..ca2ae8cf7e39764a36b13945f0714e029049b690 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -118,8 +118,8 @@ static int call_daemon(const char *socket_path, int op, char *buf,
        }
 
        srv_addr.sun_family = AF_UNIX;
-       strncpy(srv_addr.sun_path, socket_path, sizeof(srv_addr.sun_path));
-       srv_addr.sun_path[sizeof(srv_addr.sun_path) - 1] = '\0';
+       assert(strlen(socket_path) < sizeof(srv_addr.sun_path));
+       xstrncpy(srv_addr.sun_path, socket_path, sizeof(srv_addr.sun_path));
 
        if (connect(s, (const struct sockaddr *) &srv_addr,
                    sizeof(struct sockaddr_un)) < 0) {
@@ -252,8 +252,8 @@ static int create_socket(struct uuidd_cxt_t *uuidd_cxt,
         * Create the address we will be binding to.
         */
        my_addr.sun_family = AF_UNIX;
-       strncpy(my_addr.sun_path, socket_path, sizeof(my_addr.sun_path));
-       my_addr.sun_path[sizeof(my_addr.sun_path) - 1] = '\0';
+       assert(strlen(socket_path) < sizeof(my_addr.sun_path));
+       xstrncpy(my_addr.sun_path, socket_path, sizeof(my_addr.sun_path));
        unlink(socket_path);
        save_umask = umask(0);
        if (bind(s, (const struct sockaddr *) &my_addr,
@@ -636,6 +636,10 @@ int main(int argc, char **argv)
                }
        }
 
+       if (strlen(socket_path) >= sizeof(((struct sockaddr_un *)0)->sun_path)) {
+               errx(EXIT_FAILURE, _("socket name too long: %s"), socket_path);
+       }
+
        if (!no_pid && !pidfile_path)
                pidfile_path = UUIDD_PIDFILE_PATH;
 

diff --git a/tests/ts/uuid/uuidd b/tests/ts/uuid/uuidd
index 17cf29d0641a632d658be4ae5b1d4025bd474aca..16dc45e3fdeb78318abe4c9d720d1539e6bb31e6 100755 (executable)
--- a/tests/ts/uuid/uuidd
+++ b/tests/ts/uuid/uuidd
@@ -23,7 +23,8 @@ ts_check_test_command "$TS_CMD_UUIDD"
 
 OUTPUT_FILE="$(mktemp "${TS_OUTDIR}/uuiddXXXXXXXXXXXXX")"
 UUIDD_PID="$(mktemp -u "${TS_OUTDIR}/uuiddXXXXXXXXXXXXX")"
-UUIDD_SOCKET="$(mktemp -u "${TS_OUTDIR}/uuiddXXXXXXXXXXXXX")"
+# socket path must be short (SIZEOF_SOCKADDR_UN_SUN_PATH 108)
+UUIDD_SOCKET=$(mktemp "/tmp/ultest-$TS_COMPONENT-$TS_TESTNAME-socketXXXXXX")
 
 $TS_CMD_UUIDD -p "$UUIDD_PID" -s "$UUIDD_SOCKET"
 if [ $? -ne 0 ]; then