From 1c9e1cce1604aa1629fe4ade9dd81a6b6e0fbb99 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 15 Jan 2019 10:54:02 -0800 Subject: kernel_loader: fix ELF Phdr p_type comparison The program header p_type field is an enumerated value, not a bitfield. BUG=None TEST=Boot a kernel Change-Id: I5327cc8de9d8401a74c86fd4f3deab9f390c0924 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/1412835 Tested-by: kokoro Reviewed-by: Dylan Reid --- kernel_loader/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel_loader') diff --git a/kernel_loader/src/lib.rs b/kernel_loader/src/lib.rs index 13ada13..b0fdf66 100644 --- a/kernel_loader/src/lib.rs +++ b/kernel_loader/src/lib.rs @@ -119,7 +119,7 @@ where // Read in each section pointed to by the program headers. for phdr in &phdrs { - if (phdr.p_type & elf::PT_LOAD) == 0 || phdr.p_filesz == 0 { + if phdr.p_type != elf::PT_LOAD || phdr.p_filesz == 0 { continue; } -- cgit 1.4.1