Re: [PATCH] abspath.c: use PATH_MAX in real_path_internal()
- From
René Scharfe <l.s.r@web.de>
- Date
- Jul 20, 2014, 08:00 UTC
- Message-ID
- <53CB7729.40101@web.de>
- In-Reply-To
- <53CB0D81.1070404@gmail.com>
Am 20.07.2014 02:29, schrieb Karsten Blees:
Show 6 quoted lines
> unix-socket.c: This looks pretty broken. The cd / cd back logic is only > ever used if the socket path is too long. In this case, after cd'ing to > the parent directory of the socket, unix_stream_listen tries to unlink > the *original* socket path, instead of the remaining socket basename in > sockaddr_un.sun_path. I.e. the subsequent bind() will fail on second > invocation of the credential daemon.
-- >8 -- Subject: [PATCH] unix-socket: remove stale socket before calling chdir()
unix_stream_listen() is given a path. It calls unix_sockaddr_init(), which in turn can call chdir(). After that a relative path doesn't mean the same as before. Any use of the original path should thus happen before that call. For that reason, unlink the given path (to get rid of a possibly existing stale socket) right at the beginning of the function.
Noticed-by: Karsten Blees <karsten.blees@gmail.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> --- unix-socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/unix-socket.c b/unix-socket.c index 01f119f..91bd6b8 100644 --- a/unix-socket.c +++ b/unix-socket.c @@ -99,11 +99,12 @@ int unix_stream_listen(const char *path) struct sockaddr_un sa; struct unix_sockaddr_context ctx; + unlink(path); + if (unix_sockaddr_init(&sa, path, &ctx) < 0) return -1; fd = unix_stream_socket(); - unlink(path); if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) goto fail;
-- 2.0.2