Merge branch 'Plasma/5.7'

This commit is contained in:
Martin Gräßlin 2016-06-25 15:58:23 +02:00
commit a97d438b6c

View file

@ -419,6 +419,16 @@ static void disablePtrace()
} }
static void unsetDumpable(int sig)
{
#if HAVE_PR_SET_DUMPABLE
prctl(PR_SET_DUMPABLE, 1);
#endif
signal(sig, SIG_IGN);
raise(sig);
return;
}
} // namespace } // namespace
int main(int argc, char * argv[]) int main(int argc, char * argv[])
@ -433,6 +443,8 @@ int main(int argc, char * argv[])
signal(SIGINT, SIG_IGN); signal(SIGINT, SIG_IGN);
if (signal(SIGHUP, KWin::sighandler) == SIG_IGN) if (signal(SIGHUP, KWin::sighandler) == SIG_IGN)
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
signal(SIGABRT, KWin::unsetDumpable);
signal(SIGSEGV, KWin::unsetDumpable);
// ensure that no thread takes SIGUSR // ensure that no thread takes SIGUSR
sigset_t userSignals; sigset_t userSignals;
sigemptyset(&userSignals); sigemptyset(&userSignals);