diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-15 21:51:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-15 21:51:40 +0000 |
| commit | 5ca540b51d3dcf632793dc5f45458317af24876a (patch) | |
| tree | a98ce5df4d07d3549cba93dda43b887a0f5732d6 | |
| parent | 6c1072fdc11701c204a7f279c8f0f6dc74f11225 (diff) | |
| download | illumos-joyent-5ca540b51d3dcf632793dc5f45458317af24876a.tar.gz | |
OS-3642 failed assert when exiting zlogin due to OS-3140 fix
| -rw-r--r-- | usr/src/uts/common/os/sig.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/common/os/sig.c b/usr/src/uts/common/os/sig.c index 32518dcd5c..b117bf3584 100644 --- a/usr/src/uts/common/os/sig.c +++ b/usr/src/uts/common/os/sig.c @@ -1759,10 +1759,12 @@ post_sigcld(proc_t *cp, sigqueue_t *sqp) /* * This can only happen when the parent is init. * (See call to sigcld(q, NULL) in exit().) - * Use KM_NOSLEEP to avoid deadlock. + * Use KM_NOSLEEP to avoid deadlock. The child procs + * initpid can be 1 for zlogin. */ ASSERT(pp->p_pidp->pid_id == - cp->p_zone->zone_proc_initpid); + cp->p_zone->zone_proc_initpid || + pp->p_pidp->pid_id == 1); winfo(cp, &info, 0); sigaddq(pp, NULL, &info, KM_NOSLEEP); } else { |