ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ruediger Meier 2018-03-07 10:40:23 +01:00 committed by Karel Zak
parent 76de2157cf
commit eb10dbc159
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc-utils/uuidd.c
View File

@ -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;

3
tests/ts/uuid/uuidd
View File

@ -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