| Message ID | 20170313124434.1043-4-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > Right now, if we receive a compressed page while this features are > disabled, Bad Things (TM) can happen. Just add a test for them. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > -- > > I had XBZRLE here also, but it don't need extra resources on > destination, only on source. Additionally libvirt don't enable it on > destination, so don't put it here. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > migration/ram.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 719425b..65419c1 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2514,7 +2514,7 @@ static int ram_load_postcopy(QEMUFile *f) > > static int ram_load(QEMUFile *f, void *opaque, int version_id) > { > - int flags = 0, ret = 0; > + int flags = 0, ret = 0, invalid_flags; > static uint64_t seq_iter; > int len = 0; > /* > @@ -2531,6 +2531,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > ret = -EINVAL; > } > > + invalid_flags = 0; > + > + if (!migrate_use_compression()) { > + invalid_flags |= RAM_SAVE_FLAG_COMPRESS_PAGE; > + } > /* This RCU critical section can be very long running. > * When RCU reclaims in the code start to become numerous, > * it will be necessary to reduce the granularity of this > @@ -2551,6 +2556,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > flags = addr & ~TARGET_PAGE_MASK; > addr &= TARGET_PAGE_MASK; > > + if (flags & invalid_flags) { > + if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { > + error_report("Received an unexpected compressed page"); > + } > + > + ret = -EINVAL; > + break; > + } > + > if (flags & (RAM_SAVE_FLAG_COMPRESS | RAM_SAVE_FLAG_PAGE | > RAM_SAVE_FLAG_COMPRESS_PAGE | RAM_SAVE_FLAG_XBZRLE)) { > RAMBlock *block = ram_block_from_stream(f, flags); > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index 719425b..65419c1 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2514,7 +2514,7 @@ static int ram_load_postcopy(QEMUFile *f) static int ram_load(QEMUFile *f, void *opaque, int version_id) { - int flags = 0, ret = 0; + int flags = 0, ret = 0, invalid_flags; static uint64_t seq_iter; int len = 0; /* @@ -2531,6 +2531,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ret = -EINVAL; } + invalid_flags = 0; + + if (!migrate_use_compression()) { + invalid_flags |= RAM_SAVE_FLAG_COMPRESS_PAGE; + } /* This RCU critical section can be very long running. * When RCU reclaims in the code start to become numerous, * it will be necessary to reduce the granularity of this @@ -2551,6 +2556,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) flags = addr & ~TARGET_PAGE_MASK; addr &= TARGET_PAGE_MASK; + if (flags & invalid_flags) { + if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { + error_report("Received an unexpected compressed page"); + } + + ret = -EINVAL; + break; + } + if (flags & (RAM_SAVE_FLAG_COMPRESS | RAM_SAVE_FLAG_PAGE | RAM_SAVE_FLAG_COMPRESS_PAGE | RAM_SAVE_FLAG_XBZRLE)) { RAMBlock *block = ram_block_from_stream(f, flags);