[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 06/14] block/gluster: improve defense over string to
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL 06/14] block/gluster: improve defense over string to int conversion |
Date: |
Mon, 31 Oct 2016 15:22:53 -0400 |
From: Prasanna Kumar Kalever <address@hidden>
using atoi() for converting string to int may be error prone in case if
string supplied in the argument is not a fold of numerical number,
This is not a bug because in the existing code,
static QemuOptsList runtime_tcp_opts = {
.name = "gluster_tcp",
.head = QTAILQ_HEAD_INITIALIZER(runtime_tcp_opts.head),
.desc = {
...
{
.name = GLUSTER_OPT_PORT,
.type = QEMU_OPT_NUMBER,
.help = "port number ...",
},
...
};
port type is QEMU_OPT_NUMBER, before we actually reaches atoi() port is already
defended by parse_option_number()
However It is a good practice to use function like parse_uint_full()
over atoi() to keep port self defended
Note: As now the port string to int conversion has its defence code set,
and also we understand that port argument is actually a string type,
in the follow up patch let's move port type from QEMU_OPT_NUMBER to
QEMU_OPT_STRING
[Jeff Cody: removed spurious parenthesis]
Signed-off-by: Prasanna Kumar Kalever <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
---
block/gluster.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/block/gluster.c b/block/gluster.c
index 40bd29c..98a9132 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -14,6 +14,7 @@
#include "qapi/qmp/qerror.h"
#include "qemu/uri.h"
#include "qemu/error-report.h"
+#include "qemu/cutils.h"
#define GLUSTER_OPT_FILENAME "filename"
#define GLUSTER_OPT_VOLUME "volume"
@@ -394,6 +395,7 @@ static struct glfs
*qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
int ret;
int old_errno;
GlusterServerList *server;
+ unsigned long long port;
glfs = glfs_find_preopened(gconf->volume);
if (glfs) {
@@ -413,10 +415,17 @@ static struct glfs
*qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
GlusterTransport_lookup[server->value->type],
server->value->u.q_unix.path, 0);
} else {
+ if (parse_uint_full(server->value->u.tcp.port, &port, 10) < 0 ||
+ port > 65535) {
+ error_setg(errp, "'%s' is not a valid port number",
+ server->value->u.tcp.port);
+ errno = EINVAL;
+ goto out;
+ }
ret = glfs_set_volfile_server(glfs,
GlusterTransport_lookup[server->value->type],
server->value->u.tcp.host,
- atoi(server->value->u.tcp.port));
+ (int)port);
}
if (ret < 0) {
--
2.7.4
- [Qemu-block] [PULL 00/14] Block patches for 2.8, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 01/14] qapi: add release designator to gluster logfile option, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 02/14] rbd: make the code more readable, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 03/14] block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 04/14] block/gluster: memory usage: use one glfs instance per volume, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 05/14] block: Turn on "unmap" in active commit, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 07/14] block/gluster: fix port type in the QAPI options list, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 06/14] block/gluster: improve defense over string to int conversion,
Jeff Cody <=
- [Qemu-block] [PULL 08/14] blockjobs: hide internal jobs from management API, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 09/14] blockjobs: Allow creating internal jobs, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 10/14] Replication/Blockjobs: Create replication jobs as internal, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 12/14] Blockjobs: Internalize user_pause logic, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 11/14] blockjob: centralize QMP event emissions, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 14/14] blockjobs: fix documentation, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 13/14] blockjobs: split interface into public/private, Part 1, Jeff Cody, 2016/10/31