diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 16:07:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 16:07:04 +0100 |
| commit | 80008a6a298104e25d1b806b673eccc5ff58d1aa (patch) | |
| tree | 70f4f575dcf809f79cc29aece5e0a77e8db7049e | |
| parent | 592fb17691e03606ad16e36a4d52d1818721f4cd (diff) | |
| parent | 8bc891279604186562f59a4239e42dcb451c60d3 (diff) | |
| download | qemu-80008a6a298104e25d1b806b673eccc5ff58d1aa.zip qemu-80008a6a298104e25d1b806b673eccc5ff58d1aa.tar.gz qemu-80008a6a298104e25d1b806b673eccc5ff58d1aa.tar.bz2 | |
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>
| -rw-r--r-- | util/qemu-sockets.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index e3d29ee..a4a1e9d 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -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, |