inet_listen_opts: add error checking
PATCH v3 1/1 inet_listen_opts: add error checking
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.
[ v3: oops, v2 didn't build ]
[ v2: use parse_uint_full instead of strtol ]
--- util/qemu-sockets.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
util/qemu-sockets.c +12 -2
@@ -133,8 +133,18 @@ 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; +if (parse_uint_full (port, &baseport,10 ) <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,
Signature · 1 line
1.8.3.1
Quoted 6 lines · 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.[ v3: oops, v2 didn't build ]
[ v2: useparse_uint_fullinstead of strtol ]
Patch changelog belongs...
Quoted 3 lines
Signed-off-by Gerd Hoffmann <[email protected]>---
...here, so that 'git am' will strip it (it's useful for reviewers on list, but not in 'git log', where you no longer have access to v1 or v2).
Quoted 8 lines
util/qemu-sockets.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)util/qemu-sockets.c +0
-0
util/qemu-sockets.c int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) · line 138
Quoted 8 lines
util/qemu-sockets.c +3
-2@@ -133,8 +133,18 @@ 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; +if (parse_uint_full (port, &baseport,10 ) <0 ) {
parse_uint_full takes an 'unsigned long long *', but you are passing an 'int *'. I'm surprised it compiled for you. It causes a buffer overflow if the pointer is assigned to, and gives different results depending on platform endianness.
util/qemu-sockets.c int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) · line 143
Quoted 5 lines
util/qemu-sockets.c +5
-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);
But errno is not set to a sane value at this point, so error_setg() is wrong.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Hi,
Quoted 4 lines
parse_uint_fulltakes an 'unsigned long long *', but you are passing an 'int *'. I'm surprised it compiled for you. It causes a buffer overflow if the pointer is assigned to, and gives different results depending on platform endianness.
Fixed in v4.
Quoted 8 lines
util/qemu-sockets.c int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) · line 143
Quoted 5 lines
util/qemu-sockets.c +5
-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);But errno is not set to a sane value at this point, so
error_setg()is wrong.
That would be true for error_setg_errno()-
cheers,
Gerd