From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqiT3-0006P0-Mv for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:00:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqiSx-0000Ka-Oq for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:00:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqiSx-0000KV-Gs for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:00:35 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBBC0XKW003583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 11 Dec 2013 07:00:34 -0500 From: Gerd Hoffmann Date: Wed, 11 Dec 2013 13:00:30 +0100 Message-Id: <1386763230-9202-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. 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