Uniquely identify the PVH note header

According to Linux kernel documentation:
Each note has three parts: a name, a type and a desc.  The name is
intended to distinguish the note's originator, so it would be a
company, project, subsystem, etc; it must be in a suitable form for
use in a section name.  The type is an integer which is used to tag
the data, and is considered to be within the "name" namespace (so
"FooCo"'s type 42 is distinct from "BarProj"'s type 42).  The
"desc" field is the actual data.  There are no constraints on the
desc field's contents, though typically they're fairly small.

So check both name and type when searching for the PVH note.

Signed-off-by: Liu Jiang <[email protected]>

Author: jiangliu

src/loader/mod.rs

@@ -306,6 +306,11 @@ impl KernelLoader for Elf {
     }
 }
 
+#[cfg(feature = "elf")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+// Size of string "PVHNote", including the terminating NULL.
+const PVH_NOTE_STR_SZ: usize = 8;
+
 #[cfg(feature = "elf")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 fn parse_elf_note<F>(phdr: &elf::Elf64_Phdr, kernel_image: &mut F) -> Result<Option<GuestAddress>>
@@ -336,9 +341,16 @@ where
         }
         // If the note header found is not the desired one, keep reading until
         // the end of the segment
-        if nhdr.n_type == XEN_ELFNOTE_PHYS32_ENTRY {
-            break;
+        if nhdr.n_type == XEN_ELFNOTE_PHYS32_ENTRY && nhdr.n_namesz as usize == PVH_NOTE_STR_SZ {
+            let mut buf = [0u8; PVH_NOTE_STR_SZ];
+            kernel_image
+                .read_exact(&mut buf)
+                .map_err(|_| Error::ReadNoteHeader)?;
+            if buf == [b'P', b'V', b'H', b'N', b'o', b't', b'e', b'\0'] {
+                break;
+            }
         }
+
         // Skip the note header plus the size of its fields (with alignment)
         read_size += mem::size_of::<elf::Elf64_Nhdr>()
             + align_up(u64::from(nhdr.n_namesz), n_align)
@@ -357,7 +369,7 @@ where
     // current position and just skip the name field contents.
     kernel_image
         .seek(SeekFrom::Current(
-            align_up(u64::from(nhdr.n_namesz), n_align) as i64,
+            align_up(u64::from(nhdr.n_namesz), n_align) as i64 - PVH_NOTE_STR_SZ as i64,
         ))
         .map_err(|_| Error::SeekNoteHeader)?;