* [Qemu-devel] [PATCH] block/blklogwrites: Make sure the log sector size is not too small
@ 2018-07-06 12:00 Ari Sundholm
2018-07-09 15:01 ` Ari Sundholm
0 siblings, 1 reply; 3+ messages in thread
From: Ari Sundholm @ 2018-07-06 12:00 UTC (permalink / raw)
To: qemu-devel; +Cc: Ari Sundholm, Kevin Wolf, Max Reitz, open list:blklogwrites
The sector size needs to be large enough to accommodate the data
structures for the log super block and log write entries. This was
previously not properly checked, which made it possible to cause
QEMU to badly misbehave.
Signed-off-by: Ari Sundholm <ari@tuxera.com>
---
block/blklogwrites.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/blklogwrites.c b/block/blklogwrites.c
index 63bf6b3..efa2c7a 100644
--- a/block/blklogwrites.c
+++ b/block/blklogwrites.c
@@ -89,7 +89,10 @@ static inline uint32_t blk_log_writes_log2(uint32_t value)
static inline bool blk_log_writes_sector_size_valid(uint32_t sector_size)
{
- return sector_size < (1ull << 24) && is_power_of_2(sector_size);
+ return is_power_of_2(sector_size) &&
+ sector_size >= sizeof(struct log_write_super) &&
+ sector_size >= sizeof(struct log_write_entry) &&
+ sector_size < (1ull << 24);
}
static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] block/blklogwrites: Make sure the log sector size is not too small
2018-07-06 12:00 [Qemu-devel] [PATCH] block/blklogwrites: Make sure the log sector size is not too small Ari Sundholm
@ 2018-07-09 15:01 ` Ari Sundholm
2018-07-10 11:19 ` Kevin Wolf
0 siblings, 1 reply; 3+ messages in thread
From: Ari Sundholm @ 2018-07-09 15:01 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Max Reitz, open list:blklogwrites
Would there be a chance of getting this included in 3.0?
On 07/06/2018 03:00 PM, Ari Sundholm wrote:
> The sector size needs to be large enough to accommodate the data
> structures for the log super block and log write entries. This was
> previously not properly checked, which made it possible to cause
> QEMU to badly misbehave.
>
> Signed-off-by: Ari Sundholm <ari@tuxera.com>
> ---
> block/blklogwrites.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/block/blklogwrites.c b/block/blklogwrites.c
> index 63bf6b3..efa2c7a 100644
> --- a/block/blklogwrites.c
> +++ b/block/blklogwrites.c
> @@ -89,7 +89,10 @@ static inline uint32_t blk_log_writes_log2(uint32_t value)
>
> static inline bool blk_log_writes_sector_size_valid(uint32_t sector_size)
> {
> - return sector_size < (1ull << 24) && is_power_of_2(sector_size);
> + return is_power_of_2(sector_size) &&
> + sector_size >= sizeof(struct log_write_super) &&
> + sector_size >= sizeof(struct log_write_entry) &&
> + sector_size < (1ull << 24);
> }
>
> static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] block/blklogwrites: Make sure the log sector size is not too small
2018-07-09 15:01 ` Ari Sundholm
@ 2018-07-10 11:19 ` Kevin Wolf
0 siblings, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2018-07-10 11:19 UTC (permalink / raw)
To: Ari Sundholm; +Cc: qemu-devel, Max Reitz, open list:blklogwrites
Am 09.07.2018 um 17:01 hat Ari Sundholm geschrieben:
> Would there be a chance of getting this included in 3.0?
Sure, this is clearly a bug fix.
Thanks, applied to the block branch.
Kevin
> On 07/06/2018 03:00 PM, Ari Sundholm wrote:
> > The sector size needs to be large enough to accommodate the data
> > structures for the log super block and log write entries. This was
> > previously not properly checked, which made it possible to cause
> > QEMU to badly misbehave.
> >
> > Signed-off-by: Ari Sundholm <ari@tuxera.com>
> > ---
> > block/blklogwrites.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/block/blklogwrites.c b/block/blklogwrites.c
> > index 63bf6b3..efa2c7a 100644
> > --- a/block/blklogwrites.c
> > +++ b/block/blklogwrites.c
> > @@ -89,7 +89,10 @@ static inline uint32_t blk_log_writes_log2(uint32_t value)
> > static inline bool blk_log_writes_sector_size_valid(uint32_t sector_size)
> > {
> > - return sector_size < (1ull << 24) && is_power_of_2(sector_size);
> > + return is_power_of_2(sector_size) &&
> > + sector_size >= sizeof(struct log_write_super) &&
> > + sector_size >= sizeof(struct log_write_entry) &&
> > + sector_size < (1ull << 24);
> > }
> > static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,
> >
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-10 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-06 12:00 [Qemu-devel] [PATCH] block/blklogwrites: Make sure the log sector size is not too small Ari Sundholm
2018-07-09 15:01 ` Ari Sundholm
2018-07-10 11:19 ` Kevin Wolf
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).