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

Add android x86_64 user struct #2748

Merged
merged 7 commits into from May 11, 2022

Conversation

s1341
Copy link
Contributor

@s1341 s1341 commented Apr 11, 2022

This PR adds the user, user_regs_struct and user_fpregs_struct structures to android x86_64

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

@Amanieu
Copy link
Member

Amanieu commented Apr 11, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Apr 11, 2022

📌 Commit 775936e has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Apr 11, 2022

⌛ Testing commit 775936e with merge 5c89880...

bors added a commit that referenced this pull request Apr 11, 2022
Add android x86_64 user struct

This PR adds the `user`, `user_regs_struct` and `user_fpregs_struct` structures to android x86_64
@bors
Copy link
Contributor

bors commented Apr 11, 2022

💔 Test failed - checks-actions

@s1341
Copy link
Contributor Author

s1341 commented Apr 12, 2022

I’m not sure I understand what the failure is. Can you help me?

@Amanieu
Copy link
Member

Amanieu commented Apr 12, 2022

You need to remove the existing definition of PTRACE_GETREGS/PTRACE_SETREGS in src/unix/linux_like/android/b32/mod.rs since they are shadowed by this definition.

@s1341
Copy link
Contributor Author

s1341 commented Apr 14, 2022

@Amanieu can you try again please?

@Amanieu
Copy link
Member

Amanieu commented Apr 18, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Apr 18, 2022

📌 Commit a498085 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Apr 18, 2022

⌛ Testing commit a498085 with merge bf84769...

bors added a commit that referenced this pull request Apr 18, 2022
Add android x86_64 user struct

This PR adds the `user`, `user_regs_struct` and `user_fpregs_struct` structures to android x86_64
@bors
Copy link
Contributor

bors commented Apr 18, 2022

💔 Test failed - checks-actions

@Amanieu
Copy link
Member

Amanieu commented Apr 18, 2022

@bors retry

@bors
Copy link
Contributor

bors commented May 5, 2022

💔 Test failed - checks-cirrus-freebsd-11

@Amanieu
Copy link
Member

Amanieu commented May 5, 2022

@bors retry

@bors
Copy link
Contributor

bors commented May 5, 2022

⌛ Testing commit c0844c3 with merge 3a7d0a1...

bors added a commit that referenced this pull request May 5, 2022
Add android x86_64 user struct

This PR adds the `user`, `user_regs_struct` and `user_fpregs_struct` structures to android x86_64
@bors
Copy link
Contributor

bors commented May 5, 2022

💔 Test failed - checks-actions

@s1341
Copy link
Contributor Author

s1341 commented May 9, 2022

@bors retry

@bors
Copy link
Contributor

bors commented May 9, 2022

@s1341: 🔑 Insufficient privileges: not in try users

@s1341
Copy link
Contributor Author

s1341 commented May 9, 2022

@Amanieu sorry for all the failed attempts. Can we try this commit please?

@Amanieu
Copy link
Member

Amanieu commented May 11, 2022

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2022

📌 Commit b484a8d has been approved by Amanieu

@bors
Copy link
Contributor

bors commented May 11, 2022

⌛ Testing commit b484a8d with merge 454fb0e...

@bors
Copy link
Contributor

bors commented May 11, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 454fb0e to master...

@bors bors merged commit 454fb0e into rust-lang:master May 11, 2022
@s1341 s1341 deleted the add_android_x86_64_user_struct branch May 11, 2022 04:05
@s1341
Copy link
Contributor Author

s1341 commented May 11, 2022

Thanks! Please let me know when this is in a release...

@Amanieu
Copy link
Member

Amanieu commented May 12, 2022

If you need these functions in a release, please submit a PR to bump the libc version. I will then publish a new version of the crate.

impl ::hash::Hash for user_fpregs_struct {
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
self.cwd.hash(state);
self.ftw.hash(state);
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry I'm so late with this, but why is swd missing here? It's included in PartialEq, so I guess it's a bug, but I'm not sure so I won't submit a PR to change this.

Note also that swd is missing from the Debug impl.

Copy link
Member

Choose a reason for hiding this comment

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

I think this is an oversight. A PR would be appreciated.

Minoru added a commit to Minoru/libc that referenced this pull request May 26, 2022
bors added a commit that referenced this pull request May 28, 2022
…itor

Add `swd` field to impls for user_fpregs_struct

Addresses #2748 (comment)
bors bot pushed a commit to stackabletech/secret-operator that referenced this pull request Jun 9, 2022
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [async-trait](https://togithub.com/dtolnay/async-trait) | dependencies | patch | `0.1.53` -> `0.1.56` |
| [clap](https://togithub.com/clap-rs/clap) | dependencies | patch | `3.1.17` -> `3.1.18` |
| [h2](https://togithub.com/hyperium/h2) | dependencies | patch | `=0.3.7` -> `=0.3.13` |
| [libc](https://togithub.com/rust-lang/libc) | dependencies | patch | `0.2.125` -> `0.2.126` |
| [prost](https://togithub.com/tokio-rs/prost) | dependencies | patch | `0.10.3` -> `0.10.4` |
| [tokio-stream](https://tokio.rs) ([source](https://togithub.com/tokio-rs/tokio)) | dependencies | patch | `0.1.8` -> `0.1.9` |
| [tracing](https://tokio.rs) ([source](https://togithub.com/tokio-rs/tracing)) | dependencies | patch | `0.1.34` -> `0.1.35` |

---

### Release Notes

<details>
<summary>dtolnay/async-trait</summary>

### [`v0.1.56`](https://togithub.com/dtolnay/async-trait/releases/tag/0.1.56)

[Compare Source](https://togithub.com/dtolnay/async-trait/compare/0.1.55...0.1.56)

-   Fix build errors that involve <code>use parentheses to disambiguate: \`(impl 'async_trait + Trait)\`</code> ([#&#8203;204](https://togithub.com/dtolnay/async-trait/issues/204))

### [`v0.1.55`](https://togithub.com/dtolnay/async-trait/releases/tag/0.1.55)

[Compare Source](https://togithub.com/dtolnay/async-trait/compare/0.1.54...0.1.55)

-   Fix drop order of uncaptured arguments (`_`) when compiling in 2021 edition's closure capture rules ([#&#8203;199](https://togithub.com/dtolnay/async-trait/issues/199))

### [`v0.1.54`](https://togithub.com/dtolnay/async-trait/releases/tag/0.1.54)

[Compare Source](https://togithub.com/dtolnay/async-trait/compare/0.1.53...0.1.54)

-   Fix lifetime issue when using `impl Trait` in an async function argument type ([#&#8203;177](https://togithub.com/dtolnay/async-trait/issues/177))

</details>

<details>
<summary>clap-rs/clap</summary>

### [`v3.1.18`](https://togithub.com/clap-rs/clap/blob/HEAD/CHANGELOG.md#&#8203;3118---2022-05-10)

[Compare Source](https://togithub.com/clap-rs/clap/compare/v3.1.17...v3.1.18)

##### Fixes

-   Fix deprecated `arg_enum!` for users migrating to clap3 ([#&#8203;3717](https://togithub.com/clap-rs/clap/issues/3717))
-   Verify all `required_unless_present_all` arguments exist
-   Verify group members exist before processing group members ([#&#8203;3711](https://togithub.com/clap-rs/clap/issues/3711))
-   *(help)* Use `...` when not enough `value_names` are supplied

**gated behind `unstable-v4`**

-   Verify `required` is not used with conditional required settings ([#&#8203;3660](https://togithub.com/clap-rs/clap/issues/3660))
-   Disallow more `value_names` than `number_of_values` ([#&#8203;2695](https://togithub.com/clap-rs/clap/issues/2695))
-   *(parser)* Assert on unknown args when using external subcommands ([#&#8203;3703](https://togithub.com/clap-rs/clap/issues/3703))
-   *(parser)* Always fill in `""` argument for external subcommands ([#&#8203;3263](https://togithub.com/clap-rs/clap/issues/3263))
-   *(derive)* Detect escaped external subcommands that look like built-in subcommands ([#&#8203;3703](https://togithub.com/clap-rs/clap/issues/3703))
-   *(derive)* Leave `Arg::id` as `verbatim` casing ([#&#8203;3282](https://togithub.com/clap-rs/clap/issues/3282))

</details>

<details>
<summary>hyperium/h2</summary>

### [`v0.3.13`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;0313-March-31-2022)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.12...v0.3.13)

-   Update private internal `tokio-util` dependency.

### [`v0.3.12`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;0312-March-9-2022)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.11...v0.3.12)

-   Avoid time operations that can panic ([#&#8203;599](https://togithub.com/hyperium/h2/issues/599))
-   Bump MSRV to Rust 1.49 ([#&#8203;606](https://togithub.com/hyperium/h2/issues/606))
-   Fix header decoding error when a header name is contained at a continuation
    header boundary ([#&#8203;589](https://togithub.com/hyperium/h2/issues/589))
-   Remove I/O type names from handshake `tracing` spans ([#&#8203;608](https://togithub.com/hyperium/h2/issues/608))

### [`v0.3.11`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;0311-January-26-2022)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.10...v0.3.11)

-   Make `SendStream::poll_capacity` never return `Ok(Some(0))` ([#&#8203;596](https://togithub.com/hyperium/h2/issues/596))
-   Fix panic when receiving already reset push promise ([#&#8203;597](https://togithub.com/hyperium/h2/issues/597))

### [`v0.3.10`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;0310-January-6-2022)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.9...v0.3.10)

-   Add `Error::is_go_away()` and `Error::is_remote()` methods.
-   Fix panic if receiving malformed PUSH_PROMISE with stream ID of 0.

### [`v0.3.9`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;039-December-9-2021)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.8...v0.3.9)

-   Fix hang related to new `max_send_buffer_size`.

### [`v0.3.8`](https://togithub.com/hyperium/h2/blob/HEAD/CHANGELOG.md#&#8203;038-December-8-2021)

[Compare Source](https://togithub.com/hyperium/h2/compare/v0.3.7...v0.3.8)

-   Add "extended CONNECT support". Adds `h2::ext::Protocol`, which is used for request and response extensions to connect new protocols over an HTTP/2 stream.
-   Add `max_send_buffer_size` options to client and server builders, and a default of ~400MB. This acts like a high-water mark for the `poll_capacity()` method.
-   Fix panic if receiving malformed HEADERS with stream ID of 0.

</details>

<details>
<summary>rust-lang/libc</summary>

### [`v0.2.126`](https://togithub.com/rust-lang/libc/releases/tag/0.2.126)

[Compare Source](https://togithub.com/rust-lang/libc/compare/0.2.125...0.2.126)

#### What's Changed

-   Update GitHub Actions actions/checkout@v2 to v3 by [@&#8203;dtolnay](https://togithub.com/dtolnay) in [rust-lang/libc#2774
-   Remove FreeBSD 11 from CI by [@&#8203;Amanieu](https://togithub.com/Amanieu) in [rust-lang/libc#2779
-   linux: add GRND_INSECURE constant by [@&#8203;zx2c4](https://togithub.com/zx2c4) in [rust-lang/libc#2743
-   haiku build fix by [@&#8203;devnexen](https://togithub.com/devnexen) in [rust-lang/libc#2772
-   openbsd: constantify some arguments of openpty() and forkpty() by [@&#8203;semarie](https://togithub.com/semarie) in [rust-lang/libc#2773
-   Enable aio\_{read,write}v on FreeBSD by [@&#8203;asomers](https://togithub.com/asomers) in [rust-lang/libc#2775
-   Enable sock_txtime on mips musl target by [@&#8203;cww0614](https://togithub.com/cww0614) in [rust-lang/libc#2776
-   add malloc_usable_size for musl by [@&#8203;jjl](https://togithub.com/jjl) in [rust-lang/libc#2777
-   Add ENOTSUP constant for riscv64 musl by [@&#8203;nmeum](https://togithub.com/nmeum) in [rust-lang/libc#2784
-   Add LIO_READV and LIO_WRITEV on FreeBSD by [@&#8203;asomers](https://togithub.com/asomers) in [rust-lang/libc#2780
-   Fix definition of kevent.data on 32-bit FreeBSD 12+ by [@&#8203;asomers](https://togithub.com/asomers) in [rust-lang/libc#2782
-   Add DragonFlyBSD kinfo_proc and kinfo_lwp structs by [@&#8203;Freaky](https://togithub.com/Freaky) in [rust-lang/libc#2783
-   Add OpenBSD kinfo_proc struct by [@&#8203;Freaky](https://togithub.com/Freaky) in [rust-lang/libc#2786
-   Add android x86\_64 user struct by [@&#8203;s1341](https://togithub.com/s1341) in [rust-lang/libc#2748
-   Promote pthread_getname_np and pthread_setname_np from glibc to linux by [@&#8203;colincross](https://togithub.com/colincross) in [rust-lang/libc#2768
-   Allow unused macro rules by [@&#8203;Amanieu](https://togithub.com/Amanieu) in [rust-lang/libc#2790
-   Bump version to 0.2.126 by [@&#8203;s1341](https://togithub.com/s1341) in [rust-lang/libc#2789

#### New Contributors

-   [@&#8203;dtolnay](https://togithub.com/dtolnay) made their first contribution in [rust-lang/libc#2774
-   [@&#8203;zx2c4](https://togithub.com/zx2c4) made their first contribution in [rust-lang/libc#2743
-   [@&#8203;cww0614](https://togithub.com/cww0614) made their first contribution in [rust-lang/libc#2776
-   [@&#8203;jjl](https://togithub.com/jjl) made their first contribution in [rust-lang/libc#2777
-   [@&#8203;nmeum](https://togithub.com/nmeum) made their first contribution in [rust-lang/libc#2784
-   [@&#8203;s1341](https://togithub.com/s1341) made their first contribution in [rust-lang/libc#2748
-   [@&#8203;colincross](https://togithub.com/colincross) made their first contribution in [rust-lang/libc#2768

**Full Changelog**: rust-lang/libc@0.2.125...0.2.126

</details>

<details>
<summary>tokio-rs/prost</summary>

### [`v0.10.4`](https://togithub.com/tokio-rs/prost/releases/tag/v0.10.4)

[Compare Source](https://togithub.com/tokio-rs/prost/compare/v0.10.3...v0.10.4)

*PROST!* is a [Protocol Buffers](https://developers.google.com/protocol-buffers/) implementation for the [Rust Language](https://www.rust-lang.org/). `prost` generates simple, idiomatic Rust code from `proto2` and `proto3` files.

Small fix for compiling protoc from source to speed up compile times.

</details>

<details>
<summary>tokio-rs/tokio</summary>

### [`v0.1.9`](https://togithub.com/tokio-rs/tokio/compare/tokio-stream-0.1.8...tokio-stream-0.1.9)

[Compare Source](https://togithub.com/tokio-rs/tokio/compare/tokio-stream-0.1.8...tokio-stream-0.1.9)

</details>

<details>
<summary>tokio-rs/tracing</summary>

### [`v0.1.35`](https://togithub.com/tokio-rs/tracing/releases/tag/tracing-0.1.35)

[Compare Source](https://togithub.com/tokio-rs/tracing/compare/tracing-0.1.34...tracing-0.1.35)

This release reduces the overhead of callsite registration by using new
`tracing-core` APIs.

##### Added

-   Use `DefaultCallsite` to reduce callsite registration overhead ([#&#8203;2083])

##### Changed

-   `tracing-core`: updated to [0.1.27][core-0.1.27]

[core-0.1.27]: https://togithub.com/tokio-rs/tracing/releases/tag/tracing-core-0.1.27

[#&#8203;2083]: https://togithub.com/tokio-rs/tracing/pull/2083

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5:00 and before 6:00 every weekday" in timezone Europe/Berlin, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/stackabletech/secret-operator).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants