NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu-blockjob: Fix limit of bandwidth for block jobs to supported value

Browse Source 
The JSON generator is able to represent only values less than LLONG_MAX, fix the
bandwidth limit checks when converting to value to catch overflows before they
reach the generator.
This commit is contained in:
Peter Krempa 2013-04-03 10:36:03 +02:00
parent ad5298e177
commit 24ca8fae64
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_monitor.c
View File

@ -2889,12 +2889,13 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon,
"flags=%x", "flags=%x",
mon, device, file, NULLSTR(format), bandwidth, flags); mon, device, file, NULLSTR(format), bandwidth, flags);
/* Convert bandwidth MiB to bytes */ /* Convert bandwidth MiB to bytes - unfortunately the JSON QMP protocol is
* limited to LLONG_MAX also for unsigned values */
speed = bandwidth; speed = bandwidth;
if (speed > ULLONG_MAX / 1024 / 1024) { if (speed > LLONG_MAX >> 20) {
virReportError(VIR_ERR_OVERFLOW, virReportError(VIR_ERR_OVERFLOW,
_("bandwidth must be less than %llu"), _("bandwidth must be less than %llu"),
ULLONG_MAX / 1024 / 1024); LLONG_MAX >> 20);
return -1; return -1;
} }
speed <<= 20; speed <<= 20;
@ -2936,12 +2937,13 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *device,
VIR_DEBUG("mon=%p, device=%s, top=%s, base=%s, bandwidth=%ld", VIR_DEBUG("mon=%p, device=%s, top=%s, base=%s, bandwidth=%ld",
mon, device, NULLSTR(top), NULLSTR(base), bandwidth); mon, device, NULLSTR(top), NULLSTR(base), bandwidth);
/* Convert bandwidth MiB to bytes */ /* Convert bandwidth MiB to bytes - unfortunately the JSON QMP protocol is
* limited to LLONG_MAX also for unsigned values */
speed = bandwidth; speed = bandwidth;
if (speed > ULLONG_MAX / 1024 / 1024) { if (speed > LLONG_MAX >> 20) {
virReportError(VIR_ERR_OVERFLOW, virReportError(VIR_ERR_OVERFLOW,
_("bandwidth must be less than %llu"), _("bandwidth must be less than %llu"),
ULLONG_MAX / 1024 / 1024); LLONG_MAX >> 20);
return -1; return -1;
} }
speed <<= 20; speed <<= 20;
@ -3056,12 +3058,13 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon,
"modern=%d", mon, device, NULLSTR(base), bandwidth, info, mode, "modern=%d", mon, device, NULLSTR(base), bandwidth, info, mode,
modern); modern);
/* Convert bandwidth MiB to bytes */ /* Convert bandwidth MiB to bytes - unfortunately the JSON QMP protocol is
* limited to LLONG_MAX also for unsigned values */
speed = bandwidth; speed = bandwidth;
if (speed > ULLONG_MAX / 1024 / 1024) { if (speed > LLONG_MAX >> 20) {
virReportError(VIR_ERR_OVERFLOW, virReportError(VIR_ERR_OVERFLOW,
_("bandwidth must be less than %llu"), _("bandwidth must be less than %llu"),
ULLONG_MAX / 1024 / 1024); LLONG_MAX >> 20);
return -1; return -1;
} }
speed <<= 20; speed <<= 20;