| Message ID | 20201029133833.3450220-11-armbru@redhat.com |
|---|---|
| State | Accepted |
| Commit | ef298e3826e574c712d10e38a5f2a3629d6f5e01 |
| Headers | show |
| Series | sockets: Attempt to drain the abstract socket swamp | expand |
On 10/29/20 8:38 AM, Markus Armbruster wrote: > unix_listen_saddr() replaces empty @path by unique value. It obtains > the value by creating and deleting a unique temporary file with > mkstemp(). This is racy, as the comment explains. It's also entirely > undocumented as far as I can tell. Goes back to commit d247d25f18 > "sockets: helper functions for qemu (Gerd Hoffman)", v0.10.0. > > Since abstract socket addresses have no connection with filesystem > pathnames, making them up with mkstemp() seems inappropriate. Bypass > the replacement of empty @path. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > util/qemu-sockets.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com> > diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c > index 801c5e3957..18c8de8cdb 100644 > --- a/util/qemu-sockets.c > +++ b/util/qemu-sockets.c > @@ -871,7 +871,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, > return -1; > } > > - if (saddr->path && saddr->path[0]) { > + if (saddr->path[0] || saddr->abstract) { > path = saddr->path; > } else { > const char *tmpdir = getenv("TMPDIR"); > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 801c5e3957..18c8de8cdb 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -871,7 +871,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, return -1; } - if (saddr->path && saddr->path[0]) { + if (saddr->path[0] || saddr->abstract) { path = saddr->path; } else { const char *tmpdir = getenv("TMPDIR");
unix_listen_saddr() replaces empty @path by unique value. It obtains the value by creating and deleting a unique temporary file with mkstemp(). This is racy, as the comment explains. It's also entirely undocumented as far as I can tell. Goes back to commit d247d25f18 "sockets: helper functions for qemu (Gerd Hoffman)", v0.10.0. Since abstract socket addresses have no connection with filesystem pathnames, making them up with mkstemp() seems inappropriate. Bypass the replacement of empty @path. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- util/qemu-sockets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)