d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid sshd, cron, syslogd and inetd to be killed under high-pressure swap

Browse Source 
environments.
Please note that this can't be done while such processes run in jails.

Note: in future it would be interesting to find a way to do that
selectively for any desired proccess (choosen by user himself), probabilly
via a ptrace interface or whatever.

Obtained from:	Sandvine Incorporated
Reviewed by:	emaste, arch@
Sponsored by:	Sandvine Incorporated
MFC:		1 month
This commit is contained in:
attilio 2009-11-25 15:12:24 +00:00
parent 96211681e4
commit 291ffbd006
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/openssh/sshd.c
View File

@ -47,6 +47,7 @@ __RCSID("$FreeBSD$");
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
# include <sys/stat.h> # include <sys/stat.h>
@ -1293,6 +1294,10 @@ main(int ac, char **av)
/* Initialize configuration options to their default values. */ /* Initialize configuration options to their default values. */
initialize_server_options(&options); initialize_server_options(&options);
/* Avoid killing the process in high-pressure swapping environments. */
if (madvise(NULL, 0, MADV_PROTECT) != 0)
debug("madvise(): %.200s", strerror(errno));
/* Parse command-line arguments. */ /* Parse command-line arguments. */
while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) { while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) {
switch (opt) { switch (opt) {

4
usr.sbin/cron/cron/cron.c
View File

@ -24,6 +24,7 @@ static const char rcsid[] =
#include "cron.h" #include "cron.h"
#include <sys/mman.h>
#include <sys/signal.h> #include <sys/signal.h>
#if SYS_TIME_H #if SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
@ -134,6 +135,9 @@ main(argc, argv)
} }
} }
if (madvise(NULL, 0, MADV_PROTECT) != 0)
log_it("CRON", getpid(), "WARNING", "madvise() failed");
pidfile_write(pfh); pidfile_write(pfh);
database.head = NULL; database.head = NULL;
database.tail = NULL; database.tail = NULL;

4
usr.sbin/inetd/inetd.c
View File

@ -110,6 +110,7 @@ __FBSDID("$FreeBSD$");
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
@ -497,6 +498,9 @@ main(int argc, char **argv)
} }
} }
if (madvise(NULL, 0, MADV_PROTECT) != 0)
syslog(LOG_WARNING, "madvise() failed: %s", strerror(errno));
for (i = 0; i < PERIPSIZE; ++i) for (i = 0; i < PERIPSIZE; ++i)
LIST_INIT(&proctable[i]); LIST_INIT(&proctable[i]);

4
usr.sbin/syslogd/syslogd.c
View File

@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -352,6 +353,9 @@ main(int argc, char *argv[])
pid_t ppid = 1, spid; pid_t ppid = 1, spid;
socklen_t len; socklen_t len;
if (madvise(NULL, 0, MADV_PROTECT) != 0)
dprintf("madvise() failed: %s\n", strerror(errno));
bindhostname = NULL; bindhostname = NULL;
while ((ch = getopt(argc, argv, "468Aa:b:cCdf:kl:m:nop:P:sS:Tuv")) while ((ch = getopt(argc, argv, "468Aa:b:cCdf:kl:m:nop:P:sS:Tuv"))
!= -1) != -1)