diff options
| author | Paul Durrant <paul.durrant@citrix.com> | 2019-02-15 16:25:33 +0000 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2019-02-28 17:21:12 +0000 |
| commit | 2ae23f0ecf002203977b7337219e2413abd656ec (patch) | |
| tree | b4786e2a0f07297ca5196d272f0482848c8ef24e /hw/block/xen-block.c | |
| parent | 210b9776376698c50060e5383ccfac1170ae01a2 (diff) | |
| download | qemu-2ae23f0ecf002203977b7337219e2413abd656ec.zip qemu-2ae23f0ecf002203977b7337219e2413abd656ec.tar.gz qemu-2ae23f0ecf002203977b7337219e2413abd656ec.tar.bz2 | |
xen-block: report error condition from vbd_name_to_disk()
The function needs to make sure it is passed a valid disk name. This is
easily done by making sure that the parsing loop results in a non-zero
value.
Spotted by Coverity: CID 1398640
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20190215162533.19475-4-paul.durrant@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Diffstat (limited to 'hw/block/xen-block.c')
| -rw-r--r-- | hw/block/xen-block.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 29afe27..37a456c 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -351,21 +351,28 @@ static void xen_block_get_vdev(Object *obj, Visitor *v, const char *name, g_free(str); } -static unsigned int vbd_name_to_disk(const char *name, const char **endp) +static int vbd_name_to_disk(const char *name, const char **endp, + unsigned long *disk) { - unsigned int disk = 0; + unsigned int n = 0; while (*name != '\0') { if (!g_ascii_isalpha(*name) || !g_ascii_islower(*name)) { break; } - disk *= 26; - disk += *name++ - 'a' + 1; + n *= 26; + n += *name++ - 'a' + 1; } *endp = name; - return disk - 1; + if (!n) { + return -1; + } + + *disk = n - 1; + + return 0; } static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name, @@ -418,7 +425,9 @@ static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name, } } } else { - vdev->disk = vbd_name_to_disk(p, &end); + if (vbd_name_to_disk(p, &end, &vdev->disk)) { + goto invalid; + } } if (*end != '\0') { |