emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch from Daniel Povey which should allow killall5/pidof to

Browse Source 
avoid locking up if it encounters stopped or zombie processes
due to broken NFS mount points.
This should allow Debian bug #719273 to be closed.
This commit is contained in:
Jesse Smith 2018-10-27 20:26:15 -03:00
parent b4f8539153
commit 1b659c8ebe
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Changelog
View File

@ -17,6 +17,10 @@ sysvinit (2.92) unreleased; urgency=low
flag may not properly shut down network interfaces if the interface
does not have an IP address.
Addresses Debian bug #361935.
* Applied patch from Daniel Povey which should allow killall5/pidof to
avoid locking up if it encounters stopped or zombie processes
due to broken NFS mount points.
This should allow Debian bug #719273 to be closed.
sysvinit (2.91) world; urgency=low

4
man/init.8
View File

@ -153,7 +153,7 @@ about this.
.PP
When \fBinit\fP is requested to change the runlevel, it sends the
warning signal \s-1\fBSIGTERM\fP\s0 to all processes that are undefined
in the new runlevel. It then waits 5 seconds before forcibly
in the new runlevel. It then waits 3 seconds before forcibly
terminating these processes via the \s-1\fBSIGKILL\fP\s0 signal.
Note that \fBinit\fP assumes that all these processes (and their
descendants) remain in the same process group which \fBinit\fP
@ -178,7 +178,7 @@ tell \fBinit\fP to re-examine the \fB/etc/inittab\fP file.
tell \fBinit\fP to switch to single user mode.
.IP "\fBU\fP or \fBu\fP"
tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of
\fB/etc/inittab\fP file happens. Run level should be one of
\fB/etc/inittab\fP file happens. Runlevel should be one of
\fBSs0123456\fP
otherwise request would be silently ignored.
.PP

2
src/init.c
View File

@ -2224,7 +2224,7 @@ void re_exec(void)
/*
* We shouldn't be here, something failed.
* Bitch, close the state pipe, unblock signals and return.
* Close the state pipe, unblock signals and return.
*/
init_freeenv(env);
close(fd);

22
src/killall5.c
View File

@ -484,6 +484,7 @@ int readproc(int do_stat)
unsigned long startcode, endcode;
int pid, f;
ssize_t len;
char process_status[11];
/* Open the /proc directory. */
if (chdir("/proc") == -1) {
@ -567,11 +568,20 @@ int readproc(int do_stat)
/* Get session, startcode, endcode. */
startcode = endcode = 0;
/*
if (sscanf(q, "%*c %*d %*d %d %*d %*d %*u %*u "
"%*u %*u %*u %*u %*u %*d %*d "
"%*d %*d %*d %*d %*u %*u %*d "
"%*u %lu %lu",
&p->sid, &startcode, &endcode) != 3) {
*/
if (sscanf(q, "%10s %*d %*d %d %*d %*d %*u %*u "
"%*u %*u %*u %*u %*u %*d %*d "
"%*d %*d %*d %*d %*u %*u %*d "
"%*u %lu %lu",
process_status,
&p->sid, &startcode, &endcode) != 4) {
p->sid = 0;
nsyslog(LOG_ERR, "can't read sid from %s\n",
path);
@ -586,6 +596,18 @@ int readproc(int do_stat)
if (startcode == 0 && endcode == 0)
p->kernel = 1;
fclose(fp);
if ( (strchr(process_status, 'D') != NULL) ||
(strchr(process_status, 'Z') != NULL) ){
/* Ignore zombie processes or processes in
disk sleep, as attempts
to access the stats of these will
sometimes fail. */
if (p->argv0) free(p->argv0);
if (p->argv1) free(p->argv1);
if (p->statname) free(p->statname);
free(p);
continue;
}
} else {
/* Process disappeared.. */
if (p->argv0) free(p->argv0);