Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elf #37

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Elf #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6b11a
elf: simplify NX check
cgzones Mar 18, 2023
5f8667e
elf: perform checks only on functions
cgzones Mar 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use goblin::elf::dynamic::{
DF_1_NOW, DF_1_PIE, DF_BIND_NOW, DT_RPATH, DT_RUNPATH,
};
use goblin::elf::header::ET_DYN;
use goblin::elf::program_header::{PF_X, PT_GNU_RELRO, PT_GNU_STACK};
use goblin::elf::program_header::{PT_GNU_RELRO, PT_GNU_STACK};
use goblin::elf::Elf;
use serde_derive::{Deserialize, Serialize};
use std::fmt;
Expand Down Expand Up @@ -394,6 +394,9 @@ const FORTIFIABLE_FUNCTIONS: [&str; 79] = [
impl Properties for Elf<'_> {
fn has_canary(&self) -> bool {
for sym in &self.dynsyms {
if !sym.is_function() {
continue;
}
if let Some(name) = self.dynstrtab.get_at(sym.st_name) {
match name {
"__stack_chk_fail" | "__intel_security_cookie" => {
Expand All @@ -408,13 +411,19 @@ impl Properties for Elf<'_> {
#[allow(clippy::case_sensitive_file_extension_comparisons)]
fn has_clang_cfi(&self) -> bool {
for sym in &self.syms {
if !sym.is_function() {
continue;
}
if let Some(name) = self.strtab.get_at(sym.st_name) {
if name.ends_with(".cfi") {
return true;
}
}
}
for sym in &self.dynsyms {
if !sym.is_function() {
continue;
}
if let Some(name) = self.dynstrtab.get_at(sym.st_name) {
if name.ends_with(".cfi") || name == "__cfi_init" {
return true;
Expand All @@ -425,6 +434,9 @@ impl Properties for Elf<'_> {
}
fn has_clang_safestack(&self) -> bool {
for sym in &self.dynsyms {
if !sym.is_function() {
continue;
}
if let Some(name) = self.dynstrtab.get_at(sym.st_name) {
if name == "__safestack_init" {
return true;
Expand Down Expand Up @@ -478,10 +490,7 @@ impl Properties for Elf<'_> {
fn has_nx(&self) -> bool {
for header in &self.program_headers {
if header.p_type == PT_GNU_STACK {
if PF_X != header.p_flags & PF_X {
return true;
}
break;
return !header.is_executable();
}
}
false
Expand Down