File libxc-sr-use-xc_is_known_page_type.patch of Package xen.30241
From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 28 Oct 2020 14:29:50 +0100
Subject: libxc sr use xc_is_known_page_type
tools: use xc_is_known_page_type
Verify pfn type on sending side, also verify incoming batch of pfns.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
tools/libxc/xc_sr_restore.c | 3 +--
tools/libxc/xc_sr_save.c | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
--- xen-4.14.0-testing.orig/tools/libxc/xc_sr_restore.c
+++ xen-4.14.0-testing/tools/libxc/xc_sr_restore.c
@@ -406,8 +406,7 @@ static int handle_page_data(struct xc_sr
}
type = (pages->pfn[i] & PAGE_DATA_TYPE_MASK) >> 32;
- if ( ((type >> XEN_DOMCTL_PFINFO_LTAB_SHIFT) >= 5) &&
- ((type >> XEN_DOMCTL_PFINFO_LTAB_SHIFT) <= 8) )
+ if ( xc_is_known_page_type(type) == false )
{
ERROR("Invalid type %#"PRIx32" for pfn %#"PRIpfn" (index %u)",
type, pfn, i);
--- xen-4.14.0-testing.orig/tools/libxc/xc_sr_save.c
+++ xen-4.14.0-testing/tools/libxc/xc_sr_save.c
@@ -147,6 +147,12 @@ static int write_batch(struct xc_sr_cont
for ( i = 0; i < nr_pfns; ++i )
{
+ if ( xc_is_known_page_type(types[i]) == false )
+ {
+ ERROR("Wrong type %#"PRIpfn" for pfn %#"PRIpfn, types[i], mfns[i]);
+ goto err;
+ }
+
switch ( types[i] )
{
case XEN_DOMCTL_PFINFO_BROKEN: