baf20fc912
Previously, we were zeroing out the reserved signals, when we actually wanted to have TIMER_SIGNAL always be blocked, and the other signals always be unblocked. This resulted in process termination when a SIGEV_THREAD timer callback calls sigprocmask(SIG_SETMASK, ...) with any signal mask value, and then subsequently fails to complete its callback and reach the sigtimedwait in bionic before the next timer iteration triggers. Add a how argument to filter_reserved_signals to appropriately block/unblock our reserved signals. Bug: http://b/116783733 Test: bionic-unit-tests32/64 Change-Id: Ie5339682cdeb914711cd4089cd26ee395704d0df
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
|
|
#if defined(__GLIBC__)
|
|
#define posix_spawnattr_getsigdefault64 posix_spawnattr_getsigdefault
|
|
#define posix_spawnattr_getsigmask64 posix_spawnattr_getsigmask
|
|
#define posix_spawnattr_setsigdefault64 posix_spawnattr_setsigdefault
|
|
#define posix_spawnattr_setsigmask64 posix_spawnattr_setsigmask
|
|
#define pthread_sigmask64 pthread_sigmask
|
|
#define sigaction64 sigaction
|
|
#define sigaddset64 sigaddset
|
|
#define sigdelset64 sigdelset
|
|
#define sigemptyset64 sigemptyset
|
|
#define sigfillset64 sigfillset
|
|
#define sigismember64 sigismember
|
|
#define sigpending64 sigpending
|
|
#define sigprocmask64 sigprocmask
|
|
#define sigset64_t sigset_t
|
|
#define sigsuspend64 sigsuspend
|
|
#define sigtimedwait64 sigtimedwait
|
|
#define sigwait64 sigwait
|
|
#define sigwaitinfo64 sigwaitinfo
|
|
#endif
|
|
|
|
#include "private/ScopedSignalHandler.h"
|
|
|
|
class SignalMaskRestorer {
|
|
public:
|
|
SignalMaskRestorer() {
|
|
sigprocmask64(SIG_SETMASK, nullptr, &old_mask_);
|
|
}
|
|
|
|
~SignalMaskRestorer() {
|
|
sigprocmask64(SIG_SETMASK, &old_mask_, nullptr);
|
|
}
|
|
|
|
private:
|
|
sigset64_t old_mask_;
|
|
};
|
|
|
|
// uint64_t equivalents of sigsetops.
|
|
static inline void SignalSetAdd(uint64_t* sigset, int signo) {
|
|
*sigset |= 1ULL << (signo - 1);
|
|
}
|
|
|
|
static inline void SignalSetDel(uint64_t* sigset, int signo) {
|
|
*sigset &= ~(1ULL << (signo - 1));
|
|
}
|