Skip to content

Commit

Permalink
#431 Handle offsetted Elf segment case + FreeBSD CI
Browse files Browse the repository at this point in the history
An Elf segment may have a non-zero offset and that may result in
subtraction overflow when we calculating the symbol addresses.

Apart from that, CI workflows are run within GH Actions with FreeBSD
being notable exception. While FreeBSD is not supported on actions,
the conventional workaround is to run builds on macos runner using a
vagrant box.

This change
- Handles the subtraction overflow case by defaulting to zero.

- removes cirrus config and sets up a FreeBSD GH action job.
  • Loading branch information
akhramov committed Aug 8, 2021
1 parent 98795f0 commit d5113b0
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 21 deletions.
20 changes: 0 additions & 20 deletions .cirrus.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,25 @@ env:
CARGO_TERM_COLOR: always

jobs:
build-freebsd-amd64:
runs-on: macos-latest

strategy:
matrix:
box:
- fbsd_13_0
- fbsd_12_2

steps:
- uses: actions/checkout@v2
- name: Set up vagrant
run: vagrant up ${{ matrix.box }}
- name: Build
run: vagrant ssh ${{ matrix.box }} -- "cd /vagrant; cargo build --verbose"
- name: Test
run: vagrant ssh ${{ matrix.box }} -- "cd /vagrant; cargo test"


build-linux-armv7:
runs-on: [self-hosted, linux, arm]
steps:
Expand Down
35 changes: 35 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This code is taken from the Vagrantfile from libjail-rs
# https://github.com/fubarnetes/libjail-rs/blob/727353bd6565c5e7a9be2664258d0197a1c8bb35/Vagrantfile
# licensed under BSD-3 Clause License:
# BSD 3-Clause License

# Copyright (c) 2018, Fabian Freyer <[email protected]> All rights reserved.

# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

# * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

# * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

# * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Vagrant.configure("2") do |config|
config.vm.define "fbsd_13_0" do |fbsd_13_0|
fbsd_13_0.vm.box = "freebsd/FreeBSD-13.0-RELEASE"
end

config.vm.define "fbsd_12_2" do |fbsd_12_2|
fbsd_12_2.vm.box = "freebsd/FreeBSD-12.2-STABLE"
end

config.vm.synced_folder ".", "/vagrant", type: "rsync",
rsync__exclude: ".git/",
rsync__auto: true

config.vm.provision "shell", inline: <<-SHELL
pkg bootstrap
pkg install -y rust python
SHELL
end
4 changes: 3 additions & 1 deletion src/binary_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ pub fn parse_binary(_pid: remoteprocess::Pid, filename: &str, addr: u64, size: u
header.p_flags & goblin::elf::program_header::PF_X != 0)
.ok_or_else(|| format_err!("Failed to find executable PT_LOAD program header in {}", filename))?;

let offset = offset - program_header.p_vaddr;
// p_vaddr may be larger than the map address in case when the header has an offset and
// the map address is relatively small. In this case we can default to 0.
let offset = offset.checked_sub(program_header.p_vaddr).unwrap_or(0);

for sym in elf.syms.iter() {
let name = elf.strtab[sym.st_name].to_string();
Expand Down

0 comments on commit d5113b0

Please sign in to comment.