ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paul Durrant 2019-02-15 16:25:33 +00:00 committed by Anthony PERARD
parent 210b977637
commit 2ae23f0ecf
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/block/xen-block.c
View File

@ -351,21 +351,28 @@ static void xen_block_get_vdev(Object *obj, Visitor *v, const char *name,
g_free(str); 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') { while (*name != '\0') {
if (!g_ascii_isalpha(*name) || !g_ascii_islower(*name)) { if (!g_ascii_isalpha(*name) || !g_ascii_islower(*name)) {
break; break;
} }
disk *= 26; n *= 26;
disk += *name++ - 'a' + 1; n += *name++ - 'a' + 1;
} }
*endp = name; *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, 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 { } else {
vdev->disk = vbd_name_to_disk(p, &end); if (vbd_name_to_disk(p, &end, &vdev->disk)) {
goto invalid;
}
} }
if (*end != '\0') { if (*end != '\0') {