summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2009-11-17 11:39:15 +0000
committerkib <kib@FreeBSD.org>2009-11-17 11:39:15 +0000
commit2d08f816e13d4eca3a96eb24f578541791a335e7 (patch)
treec59c7fddba5c77496f61d018fe1c5c004cf33224 /sys/kern/tty.c
parent45887d4e283c9ac9f5830e01dd3a82881571fded (diff)
downloadFreeBSD-src-2d08f816e13d4eca3a96eb24f578541791a335e7.zip
FreeBSD-src-2d08f816e13d4eca3a96eb24f578541791a335e7.tar.gz
Among signal generation syscalls, only sigqueue(2) is allowed by POSIX
to fail due to lack of resources to queue siginfo. Add KSI_SIGQ flag that allows sigqueue_add() to fail while trying to allocate memory for new siginfo. When the flag is not set, behaviour is the same as for KSI_TRAP: if memory cannot be allocated, set bit in sq_kill. KSI_TRAP is kept to preserve KBI. Add SI_KERNEL si_code, to be used in siginfo.si_code when signal is generated by kernel. Deliver siginfo when signal is generated by kill(2) family of syscalls (SI_USER with properly filled si_uid and si_pid), or by kernel (SI_KERNEL, mostly job control or SIGIO). Since KSI_SIGQ flag is not set for the ksi, low memory condition cause old behaviour. Keep psignal(9) KBI intact, but modify it to generate SI_KERNEL si_code. Pgsignal(9) and gsignal(9) now take ksi explicitely. Add pksignal(9) that behaves like psignal but takes ksi, and ddb kill command implemented as pksignal(..., ksi = NULL) to not do allocation while in debugger. While there, remove some register specifiers and use ANSI C prototypes. Reviewed by: davidxu MFC after: 1 month
Diffstat (limited to 'sys/kern/tty.c')
-rw-r--r--sys/kern/tty.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 81f6741..7e6cf00 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -355,6 +355,7 @@ tty_wait_background(struct tty *tp, struct thread *td, int sig)
{
struct proc *p = td->td_proc;
struct pgrp *pg;
+ ksiginfo_t ksi;
int error;
MPASS(sig == SIGTTIN || sig == SIGTTOU);
@@ -396,8 +397,14 @@ tty_wait_background(struct tty *tp, struct thread *td, int sig)
* Send the signal and sleep until we're the new
* foreground process group.
*/
+ if (sig != 0) {
+ ksiginfo_init(&ksi);
+ ksi.ksi_code = SI_KERNEL;
+ ksi.ksi_signo = sig;
+ sig = 0;
+ }
PGRP_LOCK(pg);
- pgsignal(pg, sig, 1);
+ pgsignal(pg, ksi.ksi_signo, 1, &ksi);
PGRP_UNLOCK(pg);
error = tty_wait(tp, &tp->t_bgwait);
@@ -1240,6 +1247,8 @@ tty_signal_sessleader(struct tty *tp, int sig)
void
tty_signal_pgrp(struct tty *tp, int sig)
{
+ ksiginfo_t ksi;
+
tty_lock_assert(tp, MA_OWNED);
MPASS(sig >= 1 && sig < NSIG);
@@ -1249,8 +1258,11 @@ tty_signal_pgrp(struct tty *tp, int sig)
if (sig == SIGINFO && !(tp->t_termios.c_lflag & NOKERNINFO))
tty_info(tp);
if (tp->t_pgrp != NULL) {
+ ksiginfo_init(&ksi);
+ ksi.ksi_signo = sig;
+ ksi.ksi_code = SI_KERNEL;
PGRP_LOCK(tp->t_pgrp);
- pgsignal(tp->t_pgrp, sig, 1);
+ pgsignal(tp->t_pgrp, sig, 1, &ksi);
PGRP_UNLOCK(tp->t_pgrp);
}
}
OpenPOWER on IntegriCloud