Style fixes (mostly whitespaces).
This commit is contained in:
pjd
parent
2618fc9608
commit
0b5aef9e2b
@ -128,8 +128,8 @@ struct filterops sig_filtops = {
|
||||
};
|
||||
|
||||
static int kern_logsigexit = 1;
|
||||
SYSCTL_INT(_kern, KERN_LOGSIGEXIT, logsigexit, CTLFLAG_RW,
|
||||
&kern_logsigexit, 0,
|
||||
SYSCTL_INT(_kern, KERN_LOGSIGEXIT, logsigexit, CTLFLAG_RW,
|
||||
&kern_logsigexit, 0,
|
||||
"Log processes quitting on abnormal signals to syslog(3)");
|
||||
|
||||
static int kern_forcesigexit = 1;
|
||||
@ -171,7 +171,7 @@ SYSINIT(signal, SI_SUB_P1003_1B, SI_ORDER_FIRST+3, sigqueue_start, NULL);
|
||||
(cr1)->cr_uid == (cr2)->cr_uid)
|
||||
|
||||
static int sugid_coredump;
|
||||
SYSCTL_INT(_kern, OID_AUTO, sugid_coredump, CTLFLAG_RW,
|
||||
SYSCTL_INT(_kern, OID_AUTO, sugid_coredump, CTLFLAG_RW,
|
||||
&sugid_coredump, 0, "Allow setuid and setgid processes to dump core");
|
||||
|
||||
static int do_coredump = 1;
|
||||
@ -284,9 +284,9 @@ sigqueue_init(sigqueue_t *list, struct proc *p)
|
||||
/*
|
||||
* Get a signal's ksiginfo.
|
||||
* Return:
|
||||
* 0 - signal not found
|
||||
* 0 - signal not found
|
||||
* others - signal number
|
||||
*/
|
||||
*/
|
||||
static int
|
||||
sigqueue_get(sigqueue_t *sq, int signo, ksiginfo_t *si)
|
||||
{
|
||||
@ -357,7 +357,7 @@ sigqueue_add(sigqueue_t *sq, int signo, ksiginfo_t *si)
|
||||
int ret = 0;
|
||||
|
||||
KASSERT(sq->sq_flags & SQ_INIT, ("sigqueue not inited"));
|
||||
|
||||
|
||||
if (signo == SIGKILL || signo == SIGSTOP || si == NULL) {
|
||||
SIGADDSET(sq->sq_kill, signo);
|
||||
goto out_set_bit;
|
||||
@ -377,7 +377,7 @@ sigqueue_add(sigqueue_t *sq, int signo, ksiginfo_t *si)
|
||||
SIGADDSET(sq->sq_kill, signo);
|
||||
goto out_set_bit;
|
||||
}
|
||||
|
||||
|
||||
if (p != NULL && p->p_pendingcnt >= max_pending_per_proc) {
|
||||
signal_overflow++;
|
||||
ret = EAGAIN;
|
||||
@ -406,7 +406,7 @@ sigqueue_add(sigqueue_t *sq, int signo, ksiginfo_t *si)
|
||||
|
||||
if (ret != 0)
|
||||
return (ret);
|
||||
|
||||
|
||||
out_set_bit:
|
||||
SIGADDSET(sq->sq_signals, signo);
|
||||
return (ret);
|
||||
@ -1158,7 +1158,7 @@ sys_sigwaitinfo(struct thread *td, struct sigwaitinfo_args *uap)
|
||||
|
||||
if (uap->info)
|
||||
error = copyout(&ksi.ksi_info, uap->info, sizeof(siginfo_t));
|
||||
|
||||
|
||||
if (error == 0)
|
||||
td->td_retval[0] = ksi.ksi_signo;
|
||||
return (error);
|
||||
@ -1184,7 +1184,7 @@ kern_sigtimedwait(struct thread *td, sigset_t waitset, ksiginfo_t *ksi,
|
||||
if (timeout->tv_nsec >= 0 && timeout->tv_nsec < 1000000000) {
|
||||
timevalid = 1;
|
||||
getnanouptime(&rts);
|
||||
ets = rts;
|
||||
ets = rts;
|
||||
timespecadd(&ets, timeout);
|
||||
}
|
||||
}
|
||||
@ -1201,7 +1201,7 @@ kern_sigtimedwait(struct thread *td, sigset_t waitset, ksiginfo_t *ksi,
|
||||
mtx_unlock(&ps->ps_mtx);
|
||||
if (sig != 0 && SIGISMEMBER(waitset, sig)) {
|
||||
if (sigqueue_get(&td->td_sigqueue, sig, ksi) != 0 ||
|
||||
sigqueue_get(&p->p_sigqueue, sig, ksi) != 0) {
|
||||
sigqueue_get(&p->p_sigqueue, sig, ksi) != 0) {
|
||||
error = 0;
|
||||
break;
|
||||
}
|
||||
@ -1257,7 +1257,7 @@ kern_sigtimedwait(struct thread *td, sigset_t waitset, ksiginfo_t *ksi,
|
||||
|
||||
if (error == 0) {
|
||||
SDT_PROBE(proc, kernel, , signal_clear, sig, ksi, 0, 0, 0);
|
||||
|
||||
|
||||
if (ksi->ksi_code == SI_TIMER)
|
||||
itimer_accept(p, ksi->ksi_timerid, ksi);
|
||||
|
||||
@ -1407,7 +1407,7 @@ osigsetmask(td, uap)
|
||||
|
||||
/*
|
||||
* Suspend calling thread until signal, providing mask to be set in the
|
||||
* meantime.
|
||||
* meantime.
|
||||
*/
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct sigsuspend_args {
|
||||
@ -1643,7 +1643,7 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi)
|
||||
}
|
||||
sx_sunlock(&proctree_lock);
|
||||
LIST_FOREACH(p, &pgrp->pg_members, p_pglist) {
|
||||
PROC_LOCK(p);
|
||||
PROC_LOCK(p);
|
||||
if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
|
||||
p->p_state == PRS_NEW) {
|
||||
PROC_UNLOCK(p);
|
||||
@ -1881,7 +1881,7 @@ trapsignal(struct thread *td, ksiginfo_t *ksi)
|
||||
ktrpsig(sig, ps->ps_sigact[_SIG_IDX(sig)],
|
||||
&td->td_sigmask, code);
|
||||
#endif
|
||||
(*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)],
|
||||
(*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)],
|
||||
ksi, &td->td_sigmask);
|
||||
mask = ps->ps_catchmask[_SIG_IDX(sig)];
|
||||
if (!SIGISMEMBER(ps->ps_signodefer, sig))
|
||||
@ -1958,7 +1958,7 @@ sigtd(struct proc *p, int sig, int prop)
|
||||
* regardless of the signal action (eg, blocked or ignored).
|
||||
*
|
||||
* Other ignored signals are discarded immediately.
|
||||
*
|
||||
*
|
||||
* NB: This function may be entered from the debugger via the "kill" DDB
|
||||
* command. There is little that can be done to mitigate the possibly messy
|
||||
* side effects of this unwise possibility.
|
||||
@ -2593,14 +2593,15 @@ issignal(struct thread *td, int stop_allowed)
|
||||
* If parent wants us to take the signal,
|
||||
* then it will leave it in p->p_xstat;
|
||||
* otherwise we just look for signals again.
|
||||
*/
|
||||
*/
|
||||
if (newsig == 0)
|
||||
continue;
|
||||
sig = newsig;
|
||||
|
||||
/*
|
||||
* Put the new signal into td_sigqueue. If the
|
||||
* signal is being masked, look for other signals.
|
||||
* signal is being masked, look for other
|
||||
* signals.
|
||||
*/
|
||||
sigqueue_add(queue, sig, NULL);
|
||||
if (SIGISMEMBER(td->td_sigmask, sig))
|
||||
@ -2660,7 +2661,7 @@ issignal(struct thread *td, int stop_allowed)
|
||||
*/
|
||||
if (prop & SA_STOP) {
|
||||
if (p->p_flag & (P_TRACED|P_WEXIT) ||
|
||||
(p->p_pgrp->pg_jobc == 0 &&
|
||||
(p->p_pgrp->pg_jobc == 0 &&
|
||||
prop & SA_TTYSTOP))
|
||||
break; /* == ignore */
|
||||
|
||||
@ -2706,7 +2707,7 @@ issignal(struct thread *td, int stop_allowed)
|
||||
*/
|
||||
return (sig);
|
||||
}
|
||||
sigqueue_delete(&td->td_sigqueue, sig); /* take the signal! */
|
||||
sigqueue_delete(&td->td_sigqueue, sig); /* take the signal! */
|
||||
sigqueue_delete(&p->p_sigqueue, sig);
|
||||
}
|
||||
/* NOTREACHED */
|
||||
@ -2732,7 +2733,7 @@ thread_stopped(struct proc *p)
|
||||
PROC_SLOCK(p);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Take the action for the specified signal
|
||||
* from the current set of pending signals.
|
||||
@ -2997,7 +2998,7 @@ sysctl_debug_num_cores_check (SYSCTL_HANDLER_ARGS)
|
||||
num_cores = new_val;
|
||||
return (0);
|
||||
}
|
||||
SYSCTL_PROC(_debug, OID_AUTO, ncores, CTLTYPE_INT|CTLFLAG_RW,
|
||||
SYSCTL_PROC(_debug, OID_AUTO, ncores, CTLTYPE_INT|CTLFLAG_RW,
|
||||
0, sizeof(int), sysctl_debug_num_cores_check, "I", "");
|
||||
|
||||
#if defined(COMPRESS_USER_CORES)
|
||||
@ -3009,8 +3010,8 @@ int compress_user_cores_gzlevel = -1; /* default level */
|
||||
SYSCTL_INT(_kern, OID_AUTO, compress_user_cores_gzlevel, CTLFLAG_RW,
|
||||
&compress_user_cores_gzlevel, -1, "user core gz compression level");
|
||||
|
||||
#define GZ_SUFFIX ".gz"
|
||||
#define GZ_SUFFIX_LEN 3
|
||||
#define GZ_SUFFIX ".gz"
|
||||
#define GZ_SUFFIX_LEN 3
|
||||
#endif
|
||||
|
||||
static char corefilename[MAXPATHLEN] = {"%N.core"};
|
||||
@ -3038,7 +3039,7 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
|
||||
size_t i;
|
||||
int indexpos;
|
||||
char *hostname;
|
||||
|
||||
|
||||
hostname = NULL;
|
||||
format = corefilename;
|
||||
temp = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO);
|
||||
@ -3086,7 +3087,7 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
|
||||
sbuf_printf(&sb, "%u", uid);
|
||||
break;
|
||||
default:
|
||||
log(LOG_ERR,
|
||||
log(LOG_ERR,
|
||||
"Unknown format character %c in "
|
||||
"corename `%s'\n", format[i], format);
|
||||
}
|
||||
@ -3127,12 +3128,11 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
|
||||
for (n = 0; n < num_cores; n++) {
|
||||
temp[indexpos] = '0' + n;
|
||||
NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE,
|
||||
temp, td);
|
||||
temp, td);
|
||||
error = vn_open(&nd, &flags, cmode, NULL);
|
||||
if (error) {
|
||||
if (error == EEXIST) {
|
||||
if (error == EEXIST)
|
||||
continue;
|
||||
}
|
||||
log(LOG_ERR,
|
||||
"pid %d (%s), uid (%u): Path `%s' failed "
|
||||
"on initial open test, error = %d\n",
|
||||
@ -3199,7 +3199,8 @@ coredump(struct thread *td)
|
||||
#endif
|
||||
return (EINVAL);
|
||||
}
|
||||
if (((sugid_coredump == 0) && p->p_flag & P_SUGID) || do_coredump == 0) {
|
||||
if (((sugid_coredump == 0) && p->p_flag & P_SUGID) ||
|
||||
do_coredump == 0) {
|
||||
PROC_UNLOCK(p);
|
||||
#ifdef AUDIT
|
||||
audit_proc_coredump(td, name, EFAULT);
|
||||
@ -3207,7 +3208,7 @@ coredump(struct thread *td)
|
||||
free(name, M_TEMP);
|
||||
return (EFAULT);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Note that the bulk of limit checking is done after
|
||||
* the corefile is created. The exception is if the limit
|
||||
@ -3280,9 +3281,12 @@ coredump(struct thread *td)
|
||||
p->p_acflag |= ACORE;
|
||||
PROC_UNLOCK(p);
|
||||
|
||||
error = p->p_sysent->sv_coredump ?
|
||||
p->p_sysent->sv_coredump(td, vp, limit, compress ? IMGACT_CORE_COMPRESS : 0) :
|
||||
ENOSYS;
|
||||
if (p->p_sysent->sv_coredump != NULL) {
|
||||
error = p->p_sysent->sv_coredump(td, vp, limit,
|
||||
compress ? IMGACT_CORE_COMPRESS : 0);
|
||||
} else {
|
||||
error = ENOSYS;
|
||||
}
|
||||
|
||||
if (locked) {
|
||||
lf.l_type = F_UNLCK;
|
||||
@ -3389,7 +3393,7 @@ filt_sigdetach(struct knote *kn)
|
||||
}
|
||||
|
||||
/*
|
||||
* signal knotes are shared with proc knotes, so we apply a mask to
|
||||
* signal knotes are shared with proc knotes, so we apply a mask to
|
||||
* the hint in order to differentiate them from process hints. This
|
||||
* could be avoided by using a signal-specific knote list, but probably
|
||||
* isn't worth the trouble.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user