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.

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

Support CFI augmentation without data #438

Merged
merged 2 commits into from
Sep 19, 2019

Conversation

jan-auer
Copy link
Contributor

In a specific ARM build of libc.so, we've encountered CFI augmentations that neither use the eh nor the z format, and just define a signal trampoline ("S"). This patch changes parsing of the z operand to make it optional according to:

http://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html

@jan-auer
Copy link
Contributor Author

jan-auer commented Sep 19, 2019

The test failure on Rust 1.32.0 originates in a dependency and also happens on master.

@coveralls
Copy link

coveralls commented Sep 19, 2019

Coverage Status

Coverage increased (+0.009%) to 86.174% when pulling cef06d3 on jan-auer:fix/cfi-augmentation-no-z into 1f1a9eb on gimli-rs:master.

@fitzgen
Copy link
Member

fitzgen commented Sep 19, 2019

@philipc Regarding the CI failure: looks like flate2 doesn't support rust 1.32 anymore, which is depended upon by object. If we want to guarantee 1.32 support then we should pin object's dependency to an older version, I guess.

   Compiling flate2 v1.0.11
error[E0658]: use of unstable library feature 'try_from' (see issue #33417)
  --> /Users/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/flate2-1.0.11/src/ffi.rs:47:9
   |
47 |     use std::convert::TryFrom;
   |         ^^^^^^^^^^^^^^^^^^^^^
error[E0658]: use of unstable library feature 'try_from' (see issue #33417)
   --> /Users/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/flate2-1.0.11/src/ffi.rs:109:27
    |
109 |             .and_then(|i| usize::try_from(i).ok())
    |                           ^^^^^^^^^^^^^^^

Copy link
Member

@fitzgen fitzgen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes look good to me -- thanks @jan-auer !

@fitzgen
Copy link
Member

fitzgen commented Sep 19, 2019

Going to go ahead and merge this, since CI failure is unrelated to this PR.

@fitzgen fitzgen merged commit 7e76a9d into gimli-rs:master Sep 19, 2019
@philipc
Copy link
Collaborator

philipc commented Sep 19, 2019

If we want to guarantee 1.32 support then we should pin object's dependency to an older version, I guess.

No, we can bump that version whenever it is reasonable to do so. That test is more for simply knowing what the minimum version is.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants