Auto merge of #31684 - tmiasko:alternate-stack, r=alexcrichton
Remove alternate stack with sigaltstack before unmaping it. Also reuse existing signal stack if already set, this is especially useful when working with sanitizers that configure alternate stack themselves. This change depends on SS_DISABLE recently introduced in libc crate and updates this git submodule accordingly.
This commit is contained in:
commit
8842e28be8
3 changed files with 69 additions and 6 deletions
44
src/test/run-pass/signal-alternate-stack-cleanup.rs
Normal file
44
src/test/run-pass/signal-alternate-stack-cleanup.rs
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Previously memory for alternate signal stack have been unmapped during
|
||||
// main thread exit while still being in use by signal handlers. This test
|
||||
// triggers this situation by sending signal from atexit handler.
|
||||
//
|
||||
// ignore-windows
|
||||
|
||||
#![feature(libc)]
|
||||
extern crate libc;
|
||||
|
||||
use libc::*;
|
||||
|
||||
unsafe extern fn signal_handler(signum: c_int, _: *mut siginfo_t, _: *mut c_void) {
|
||||
assert_eq!(signum, SIGWINCH);
|
||||
}
|
||||
|
||||
extern fn send_signal() {
|
||||
unsafe {
|
||||
raise(SIGWINCH);
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
unsafe {
|
||||
// Install signal hander that runs on alternate signal stack.
|
||||
let mut action: sigaction = std::mem::zeroed();
|
||||
action.sa_flags = SA_SIGINFO | SA_ONSTACK;
|
||||
action.sa_sigaction = signal_handler as sighandler_t;
|
||||
sigaction(SIGWINCH, &action, std::ptr::null_mut());
|
||||
|
||||
// Send SIGWINCH on exit.
|
||||
atexit(send_signal);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue