mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inet_listen_opts: add error checking

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTmuCnAAoJEEy22O7T6HE4FUwP/18ASPkBFPIipJYuZ/qu3tO8
 4gKf1Rdpg5UxD9yPXGVy/BRlr0ggQr3/0AJoEgs7vqRi8QSI9FO6ZnkjcAo8BHhW
 goTUY20u3evoyw6V83ZSTOSEUnSO7auagRP5VmfXI37NKVQ3xVz+0Ot6NOZNfpCy
 x+yGaUfl5jDbYjoFBlcEr8OwsyOEzEq+JjzMZ8JAbzM54IoSPtkiZMHkqImY+YYZ
 RkLKoJDKc8lWorjmJTbfql8KdBV4Jo+dUCEOqKSQKZd49Xb2gecXtZMfN//0Odo0
 eDWgg5lQU1gFaV7dLoGQ4QIMdqThdtKAnIx7lIEowPOnSnlRCHRZv+TxHGAJzqIk
 0ndsNNKrmhnLmpXM019f5DJmCLcJ+00lJ3+QM/sMiKBYMW2/bRg6dTTlEdng3bEl
 TSi+dI8h2X29h9/yku7GCqsbxU2vpMMWS00NP8GfzwnMDiKhCH3MdV9o52kImEnL
 l6TgVWRedizfd0SC9dh3GqqxoYXlB2kf0qb9DkQbLVo7srOvGLOwKJBzl3Ggj8qi
 NsTMJPSYcLqUH5ysO86SUDwxfbIrUjyxiOXIFgD/Kkda55gRXo5EzRF7KMf3sT11
 IBcNBZ1/SQkoumglb3iSwox9DhdYxRDx9pbYAbAW3JvFFY4unZ+X27LaaG/bnGTA
 w0URswRN9LF09aq9ZtbN
 =EyoP
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-trivial-20140613-1' into staging

inet_listen_opts: add error checking

# gpg: Signature made Fri 13 Jun 2014 12:29:43 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-trivial-20140613-1:
  inet_listen_opts: add error checking

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-06-13 16:07:04 +01:00
commit 80008a6a29
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/qemu-sockets.c
View File

@ -131,8 +131,19 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp)
ai.ai_family = PF_INET6;
/* lookup */
if (port_offset)
snprintf(port, sizeof(port), "%d", atoi(port) + port_offset);
if (port_offset) {
unsigned long long baseport;
if (parse_uint_full(port, &baseport, 10) < 0) {
error_setg(errp, "can't convert to a number: %s", port);
return -1;
}
if (baseport > 65535 ||
baseport + port_offset > 65535) {
error_setg(errp, "port %s out of range", port);
return -1;
}
snprintf(port, sizeof(port), "%d", (int)baseport + port_offset);
}
rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res);
if (rc != 0) {
error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,