From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrQr2-00089G-TT for qemu-devel@nongnu.org; Fri, 13 Dec 2013 06:24:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrQqw-0006es-TE for qemu-devel@nongnu.org; Fri, 13 Dec 2013 06:24:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrQqw-0006em-08 for qemu-devel@nongnu.org; Fri, 13 Dec 2013 06:24:18 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBDBOB4n017911 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 06:24:14 -0500 From: Gerd Hoffmann Date: Fri, 13 Dec 2013 10:57:29 +0100 Message-Id: <1386928649-26263-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] inet_listen_opts: add error checking List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Don't use atoi() function which doesn't detect errors, switch to strtol and error out on failures. Also add a range check while being at it. [ v2: use parse_uint_full instead of strtol ] Signed-off-by: Gerd Hoffmann --- util/qemu-sockets.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 6b97dc1..5636510 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -133,8 +133,20 @@ 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) { + int baseport; + errno = 0; + baseport = strtol(port, NULL, 10); + if (errno != 0) { + error_setg(errp, "can't convert to a number: %s", port); + return -1; + } + if (baseport < 0 || baseport + port_offset > 65535) { + error_setg(errp, "port %s out of range", port); + return -1; + } + snprintf(port, sizeof(port), "%d", 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, -- 1.8.3.1