diff options
| author | eadler <eadler@FreeBSD.org> | 2012-10-22 03:43:02 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-10-22 03:43:02 +0000 |
| commit | 24cc54b983d23b1b82a5bd7be72e7f59e491b2a7 (patch) | |
| tree | 5f55969a1fd2279333d87a71da86b1945989d424 | |
| parent | 1434f6546acc41511714426496a00beb2069260a (diff) | |
| download | FreeBSD-src-24cc54b983d23b1b82a5bd7be72e7f59e491b2a7.zip FreeBSD-src-24cc54b983d23b1b82a5bd7be72e7f59e491b2a7.tar.gz | |
Correct the killpg(2) return values:
Return EPERM if processes were found but they
were unable to be signaled.
Return the first error from p_cansignal if no signal was successful.
Reviewed by: jilles
Approved by: cperciva
MFC after: 1 week
| -rw-r--r-- | sys/kern/kern_sig.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 13848b6..deb2098 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1599,8 +1599,10 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) { struct proc *p; struct pgrp *pgrp; - int nfound = 0; + int err; + int ret; + ret = ESRCH; if (all) { /* * broadcast @@ -1613,11 +1615,14 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) PROC_UNLOCK(p); continue; } - if (p_cansignal(td, p, sig) == 0) { - nfound++; + err = p_cansignal(td, p, sig); + if (err == 0) { if (sig) pksignal(p, sig, ksi); + ret = err; } + else if (ret == ESRCH) + ret = err; PROC_UNLOCK(p); } sx_sunlock(&allproc_lock); @@ -1644,16 +1649,19 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) PROC_UNLOCK(p); continue; } - if (p_cansignal(td, p, sig) == 0) { - nfound++; + err = p_cansignal(td, p, sig); + if (err == 0) { if (sig) pksignal(p, sig, ksi); + ret = err; } + else if (ret == ESRCH) + ret = err; PROC_UNLOCK(p); } PGRP_UNLOCK(pgrp); } - return (nfound ? 0 : ESRCH); + return (ret); } #ifndef _SYS_SYSPROTO_H_ |
