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

linux prctl add speculation control flags #2838

Merged
merged 1 commit into from
Jul 20, 2022

Conversation

devnexen
Copy link
Contributor

@devnexen devnexen commented Jul 1, 2022

No description provided.

@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@@ -626,6 +626,19 @@ pub const PTRACE_PEEKSIGINFO_SHARED: ::c_uint = 1;
pub const PTRACE_SYSEMU: ::c_uint = 31;
pub const PTRACE_SYSEMU_SINGLESTEP: ::c_uint = 32;

pub const PR_GET_SPECULATION_CTRL: ::c_int = 52;
pub const PR_SET_SPECULATION_CTRL: ::c_int = 52;
Copy link
Member

Choose a reason for hiding this comment

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

Test fails with:

 bad PR_SET_SPECULATION_CTRL value at byte 0: rust: 52 (0x34) != c 53 (0x35)

Should be: https://github.com/torvalds/linux/blob/143a6252e1b8ab424b4b293512a97cca7295c182/include/uapi/linux/prctl.h#L212

Suggested change
pub const PR_SET_SPECULATION_CTRL: ::c_int = 52;
pub const PR_SET_SPECULATION_CTRL: ::c_int = 53;

@devnexen devnexen force-pushed the linux_followup_prctl branch from 949874b to 6bc25bc Compare July 20, 2022 19:57
@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jul 20, 2022

📌 Commit 6bc25bc has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 20, 2022

⌛ Testing commit 6bc25bc with merge 90a2aa8...

bors added a commit that referenced this pull request Jul 20, 2022
linux prctl add speculation control flags
@bors
Copy link
Contributor

bors commented Jul 20, 2022

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jul 20, 2022

⌛ Testing commit 6bc25bc with merge 4238054...

@bors
Copy link
Contributor

bors commented Jul 20, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 4238054 to master...

@bors bors merged commit 4238054 into rust-lang:master Jul 20, 2022
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.

5 participants