elfload: Fix issue with loading non PROGBITS during section loading

stffrdhrn · stffrdhrn · commit eb5b018d7187 · 2023-07-21T21:55:43.000+01:00
During elf section loading the loader loads non program sections by
anding with SHT_PROGBITS(0x1).  Change the and to an equals to make it
correct.

We need to change this to actual load using program headers, but I will
do that in the next few patches.
diff --git a/cpu/common/parse.c b/cpu/common/parse.c
@@ -670,12 +670,11 @@ readfile_elf (char *filename)
 	}
     }
 
-
   for (i = 0, elf_spnt = elf_shdata; i < ELF_SHORT_H (elfhdr.e_shnum);
        i++, elf_spnt++)
     {
 
-      if ((ELF_LONG_H (elf_spnt->sh_type) & SHT_PROGBITS)
+      if ((ELF_LONG_H (elf_spnt->sh_type) == SHT_PROGBITS)
 	  && (ELF_LONG_H (elf_spnt->sh_flags) & SHF_ALLOC))
 	{
 

Original file line number	Diff line number	Diff line change
`@@ -670,12 +670,11 @@ readfile_elf (char *filename)`
`670`	`670`	`}`
`671`	`671`	`}`
`672`	`672`
`673`		`-`
`674`	`673`	`for (i = 0, elf_spnt = elf_shdata; i < ELF_SHORT_H (elfhdr.e_shnum);`
`675`	`674`	`i++, elf_spnt++)`
`676`	`675`	`{`
`677`	`676`
`678`		`- if ((ELF_LONG_H (elf_spnt->sh_type) & SHT_PROGBITS)`
	`677`	`+ if ((ELF_LONG_H (elf_spnt->sh_type) == SHT_PROGBITS)`
`679`	`678`	`&& (ELF_LONG_H (elf_spnt->sh_flags) & SHF_ALLOC))`
`680`	`679`	`{`
`681`	`680`