OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-socket unix socket bugfix 2021-09-06 

-----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmE2MYQPHG1qdEB0bHMu
 bXNrLnJ1AAoJEHAbT2saaT5ZW0UH/1N3BHFv3xjmn7337EqtBKZM8ONILpGUnhDs
 xiwrHhER42Uh6lq56e4IIAUa9e7srNTYVmTRGJGcQuErK9PH+MbY2rJ08/20PJi+
 k6tH6tziV67ESiTvP+dGV1ivGAIw3tyDhALI2TyUQMZShdT0S6fv40tHfd85alOm
 LjnX6G+LAaXMacK7tZhxM97WqT6qPWnX+eb989Ve/pbsBHsC4vDKiNJDl/stfz+Q
 96TjNhp+lPLT8ilX8Sz5vmXV1GLacTwVF69QQs1D5iaBWEN/aVY5zMCWr/icG8SP
 kMNqM7cvLnhv73YlHcUybvcTaJoeLAmWWo5noTv5HdY61oxKyew=
 =QGQO
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mjt/tags/patch-fetch' into staging

qemu-socket unix socket bugfix 2021-09-06

# gpg: Signature made Mon 06 Sep 2021 16:19:32 BST
# gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg:                issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/patch-fetch:
  qemu-sockets: fix unix socket path copy (again)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-09-07 10:15:48 +01:00
parent 935efca6c2 118d527f2e
commit a61c30b8c8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/qemu-sockets.c
View File

@ -1345,25 +1345,22 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa,
SocketAddress *addr;
struct sockaddr_un *su = (struct sockaddr_un *)sa;
assert(salen >= sizeof(su->sun_family) + 1 &&
salen <= sizeof(struct sockaddr_un));
addr = g_new0(SocketAddress, 1);
addr->type = SOCKET_ADDRESS_TYPE_UNIX;
salen -= offsetof(struct sockaddr_un, sun_path);
#ifdef CONFIG_LINUX
if (!su->sun_path[0]) {
if (salen > 0 && !su->sun_path[0]) {
/* Linux abstract socket */
addr->u.q_unix.path = g_strndup(su->sun_path + 1,
salen - sizeof(su->sun_family) - 1);
addr->u.q_unix.path = g_strndup(su->sun_path + 1, salen - 1);
addr->u.q_unix.has_abstract = true;
addr->u.q_unix.abstract = true;
addr->u.q_unix.has_tight = true;
addr->u.q_unix.tight = salen < sizeof(*su);
addr->u.q_unix.tight = salen < sizeof(su->sun_path);
return addr;
}
#endif
addr->u.q_unix.path = g_strndup(su->sun_path, sizeof(su->sun_path));
addr->u.q_unix.path = g_strndup(su->sun_path, salen);
return addr;
}
#endif /* WIN32 */