| Message ID | 1448979825-24566-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Dec 01, 2015 at 03:23:45PM +0100, Kevin Wolf wrote: > This crash was caught with qemu-iotests test case 138. > > Commit b6d36de already fixed a few 32 bit truncation bugs that could > cause qemu-img check to allocate too little memory and consequently > it would segfault. On 32 bit hosts, there is one more place that needs > to be fixed because size_t was involved in the calculation and is a > 32 bit type there. > > Cc: qemu-stable@nongnu.org > Reported-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Kevin Wolf <kwolf@redhat.com> Tested-by: Michael S. Tsirkin <mst@redhat.com> > --- > block/qcow2-refcount.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c > index 6e0e5bd..820f412 100644 > --- a/block/qcow2-refcount.c > +++ b/block/qcow2-refcount.c > @@ -1244,7 +1244,7 @@ fail: > /* refcount checking functions */ > > > -static size_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) > +static uint64_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) > { > /* This assertion holds because there is no way we can address more than > * 2^(64 - 9) clusters at once (with cluster size 512 = 2^9, and because > -- > 1.8.3.1
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6e0e5bd..820f412 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1244,7 +1244,7 @@ fail: /* refcount checking functions */ -static size_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) +static uint64_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries) { /* This assertion holds because there is no way we can address more than * 2^(64 - 9) clusters at once (with cluster size 512 = 2^9, and because
This crash was caught with qemu-iotests test case 138. Commit b6d36de already fixed a few 32 bit truncation bugs that could cause qemu-img check to allocate too little memory and consequently it would segfault. On 32 bit hosts, there is one more place that needs to be fixed because size_t was involved in the calculation and is a 32 bit type there. Cc: qemu-stable@nongnu.org Reported-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/qcow2-refcount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)