diff options
author | Jason Wang <jasowang@redhat.com> | 2010-10-25 13:39:59 +0800 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2010-10-27 18:54:02 +0200 |
commit | f7c31d6381f2cbac03e82fc23133f6863606edd8 (patch) | |
tree | ac33e75ca51852177093bd88b4d84727cf83f1a9 | |
parent | 258dc7c96bb4b7ca71d5bee811e73933310e168c (diff) | |
download | hqemu-f7c31d6381f2cbac03e82fc23133f6863606edd8.zip hqemu-f7c31d6381f2cbac03e82fc23133f6863606edd8.tar.gz |
net: properly handle illegal fd/vhostfd from command line
When hanlding fd/vhostfd form command line through net_handle_fd_param(),
we need to check mon and return value of strtol() otherwise we could
get segmentation fault or invalid fd when user type an illegal fd/vhostfd.
This patch is based on the suggestions from
Luiz Capitulino <lcapitulino@redhat.com>.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | net.c | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -774,19 +774,25 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models, int net_handle_fd_param(Monitor *mon, const char *param) { - if (!qemu_isdigit(param[0])) { - int fd; + int fd; + + if (!qemu_isdigit(param[0]) && mon) { fd = monitor_get_fd(mon, param); if (fd == -1) { error_report("No file descriptor named %s found", param); return -1; } - - return fd; } else { - return strtol(param, NULL, 0); + char *endptr = NULL; + + fd = strtol(param, &endptr, 10); + if (*endptr || (fd == 0 && param == endptr)) { + return -1; + } } + + return fd; } static int net_init_nic(QemuOpts *opts, |