* [Qemu-devel] [PATCH v2] mirror: correct buf_size
@ 2015-05-14 10:29 Wen Congyang
2015-05-14 10:38 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Wen Congyang @ 2015-05-14 10:29 UTC (permalink / raw)
To: qemu-devl, Kevin Wolf, Jeff Cody, Paolo Bonzini, Fam Zheng
If buf_size % granularity is not 0, mirror_free_init() will
do dangerous things.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
block/mirror.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 58f391a..9521212 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -684,7 +684,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
s->is_none_mode = is_none_mode;
s->base = base;
s->granularity = granularity;
- s->buf_size = MAX(buf_size, granularity);
+ s->buf_size = ROUND_UP(buf_size, granularity);
s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
if (!s->dirty_bitmap) {
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH v2] mirror: correct buf_size
2015-05-14 10:29 [Qemu-devel] [PATCH v2] mirror: correct buf_size Wen Congyang
@ 2015-05-14 10:38 ` Paolo Bonzini
2015-05-14 14:06 ` Fam Zheng
0 siblings, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2015-05-14 10:38 UTC (permalink / raw)
To: Wen Congyang, qemu-devl, Kevin Wolf, Jeff Cody, Fam Zheng
On 14/05/2015 12:29, Wen Congyang wrote:
>
> If buf_size % granularity is not 0, mirror_free_init() will
> do dangerous things.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
> block/mirror.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 58f391a..9521212 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -684,7 +684,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> s->is_none_mode = is_none_mode;
> s->base = base;
> s->granularity = granularity;
> - s->buf_size = MAX(buf_size, granularity);
> + s->buf_size = ROUND_UP(buf_size, granularity);
>
> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
> if (!s->dirty_bitmap) {
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH v2] mirror: correct buf_size
2015-05-14 10:38 ` Paolo Bonzini
@ 2015-05-14 14:06 ` Fam Zheng
2015-05-14 14:09 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2015-05-14 14:06 UTC (permalink / raw)
To: Wen Congyang, Paolo Bonzini; +Cc: Kevin Wolf, Jeff Cody, qemu-devl
On Thu, 05/14 12:38, Paolo Bonzini wrote:
>
>
> On 14/05/2015 12:29, Wen Congyang wrote:
> >
> > If buf_size % granularity is not 0, mirror_free_init() will
> > do dangerous things.
> >
> > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> > ---
> > block/mirror.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/block/mirror.c b/block/mirror.c
> > index 58f391a..9521212 100644
> > --- a/block/mirror.c
> > +++ b/block/mirror.c
> > @@ -684,7 +684,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> > s->is_none_mode = is_none_mode;
> > s->base = base;
> > s->granularity = granularity;
> > - s->buf_size = MAX(buf_size, granularity);
> > + s->buf_size = ROUND_UP(buf_size, granularity);
> >
> > s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
> > if (!s->dirty_bitmap) {
> >
>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
What if buf_size is negative?
Fam
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH v2] mirror: correct buf_size
2015-05-14 14:06 ` Fam Zheng
@ 2015-05-14 14:09 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2015-05-14 14:09 UTC (permalink / raw)
To: Fam Zheng, Wen Congyang; +Cc: Kevin Wolf, Jeff Cody, qemu-devl
On 14/05/2015 16:06, Fam Zheng wrote:
> On Thu, 05/14 12:38, Paolo Bonzini wrote:
>>
>>
>> On 14/05/2015 12:29, Wen Congyang wrote:
>>>
>>> If buf_size % granularity is not 0, mirror_free_init() will
>>> do dangerous things.
>>>
>>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>>> ---
>>> block/mirror.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/block/mirror.c b/block/mirror.c
>>> index 58f391a..9521212 100644
>>> --- a/block/mirror.c
>>> +++ b/block/mirror.c
>>> @@ -684,7 +684,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
>>> s->is_none_mode = is_none_mode;
>>> s->base = base;
>>> s->granularity = granularity;
>>> - s->buf_size = MAX(buf_size, granularity);
>>> + s->buf_size = ROUND_UP(buf_size, granularity);
>>>
>>> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
>>> if (!s->dirty_bitmap) {
>>>
>>
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>
> What if buf_size is negative?
This will fail:
s->buf = qemu_try_blockalign(bs, s->buf_size);
O:-)
but really that should be checked in mirror_start_job, so that the
command fails.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-14 14:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-14 10:29 [Qemu-devel] [PATCH v2] mirror: correct buf_size Wen Congyang
2015-05-14 10:38 ` Paolo Bonzini
2015-05-14 14:06 ` Fam Zheng
2015-05-14 14:09 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).