regenerate the invalid PVH image using ELFIO

This is needed so that we can easily reproduce the image build.
Also, included only the needed sections in the image to have a tinier
one.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

docs/TESTING.md

@@ -56,6 +56,7 @@ example, with minimal changes on top.
 | Source File | Generated Binary File |
 |-------------|-----------------------|
 | bad_align_writer.cpp | test_bad_align.bin |
+| invalid_pvh_note_writer.cpp | test_invalid_pvh_note.bin |
 
 #### Example for generating `test_bad_align.bin`
 

docs/elfio_files/invalid_pvh_note_writer.cpp

@@ -0,0 +1,75 @@
+/*
+Copyright (C) 2001-present by Serge Lamikhov-Center
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <elfio/elfio.hpp>
+
+using namespace ELFIO;
+
+int main( void )
+{
+    elfio writer;
+
+    // You can't proceed without this function call!
+    writer.create( ELFCLASS64, ELFDATA2LSB );
+
+    writer.set_os_abi( ELFOSABI_LINUX );
+    writer.set_type( ET_EXEC );
+    writer.set_machine( EM_X86_64 );
+
+    // Create a loadable segment
+    segment* load_seg = writer.segments.add();
+    load_seg->set_type( PT_LOAD );
+    load_seg->set_virtual_address( 0x400000 );
+    load_seg->set_physical_address( 0x0 );
+    load_seg->set_flags( PF_R );
+    load_seg->set_align( 0x200000 );
+
+    // Create a note segment
+    segment* note_seg = writer.segments.add();
+    note_seg->set_type( PT_NOTE );
+    note_seg->set_virtual_address( 0x04000e0 );
+    note_seg->set_physical_address( 0x04000e0 );
+    note_seg->set_flags( PF_R );
+    note_seg->set_align( 0x4 );
+
+    // Create a .note.Xen section, and add it to the note segment.
+    section* xen_note_sec = writer.sections.add( ".note.Xen" );
+    xen_note_sec->set_type( SHT_NOTE );
+    xen_note_sec->set_addr_align( 0x4 );
+    xen_note_sec->set_flags( SHF_ALLOC );
+    note_section_accessor xen_note_writer( writer, xen_note_sec );
+
+    char descr[2] = { 0x1f, 0x1e };
+    xen_note_writer.add_note( 0x12, "Xen", descr, sizeof( descr ) );
+
+    note_seg->add_section_index( xen_note_sec->get_index(),
+                                 xen_note_sec->get_addr_align() );
+
+    // Setup entry point. Usually, a linker sets this address on base of
+    // ‘_start’ label.
+    writer.set_entry( 0x400104 );
+
+    // Create ELF file
+    writer.save( "test_invalid_pvh_note.bin" );
+
+    return 0;
+}

src/loader/x86_64/elf/mod.rs

@@ -443,8 +443,8 @@ mod tests {
         include_bytes!("test_dummynote.bin").to_vec()
     }
 
-    fn make_bad_elfnote() -> Vec<u8> {
-        include_bytes!("test_badnote.bin").to_vec()
+    fn make_invalid_pvh_note() -> Vec<u8> {
+        include_bytes!("test_invalid_pvh_note.bin").to_vec()
     }
 
     fn make_bad_align() -> Vec<u8> {
@@ -567,7 +567,7 @@ mod tests {
     #[test]
     fn test_bad_elfnote() {
         let gm = create_guest_mem();
-        let badnote_image = make_bad_elfnote();
+        let badnote_image = make_invalid_pvh_note();
         assert_eq!(
             Some(KernelLoaderError::Elf(Error::InvalidPvhNote)),
             Elf::load(&gm, None, &mut Cursor::new(&badnote_image), None).err()