Attachment 1980 Details for Bug 1838 – Switched to end-of-array sentinel.

[patch] Switched to end-of-array sentinel.

openssh-linux-oomkiller.patch (text/plain), 2.90 KB, created by Darren Tucker on 2011-01-17 11:04:18 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2011-01-17 11:04:18 AEDT

Size: 2.90 KB

patch

obsolete

>? build
>Index: openbsd-compat/port-linux.c
>===================================================================
>RCS file: /var/cvs/openssh/openbsd-compat/port-linux.c,v
>retrieving revision 1.9
>diff -u -p -r1.9 port-linux.c
>--- openbsd-compat/port-linux.c	10 Sep 2010 00:30:25 -0000	1.9
>+++ openbsd-compat/port-linux.c	17 Jan 2011 00:02:45 -0000
>@@ -208,14 +208,22 @@ ssh_selinux_change_context(const char *n
> #endif /* WITH_SELINUX */
> 
> #ifdef LINUX_OOM_ADJUST
>-#define OOM_ADJ_PATH	"/proc/self/oom_adj"
> /*
>- * The magic "don't kill me", as documented in eg:
>+ * The magic "don't kill me" values, old and new, as documented in eg:
>  * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt
>+ * http://lxr.linux.no/#linux+v2.6.36/Documentation/filesystems/proc.txt
>  */
>-#define OOM_ADJ_NOKILL	-17
> 
> static int oom_adj_save = INT_MIN;
>+static char *oom_adj_path = NULL;
>+struct {
>+	char *path;
>+	int value;
>+} oom_adjust[] = {
>+	{"/proc/self/oom_score_adj", -1000},	/* kernels >= 2.6.36 */
>+	{"/proc/self/oom_adj", -17},		/* kernels <= 2.6.35 */
>+	{NULL, 0},
>+};
> 
> /*
>  * Tell the kernel's out-of-memory killer to avoid sshd.
>@@ -224,23 +232,31 @@ static int oom_adj_save = INT_MIN;
> void
> oom_adjust_setup(void)
> {
>+	int i, value;
> 	FILE *fp;
> 
> 	debug3("%s", __func__);
>-	if ((fp = fopen(OOM_ADJ_PATH, "r+")) != NULL) {
>-		if (fscanf(fp, "%d", &oom_adj_save) != 1)
>-			verbose("error reading %s: %s", OOM_ADJ_PATH, strerror(errno));
>-		else {
>-			rewind(fp);
>-			if (fprintf(fp, "%d\n", OOM_ADJ_NOKILL) <= 0)
>-				verbose("error writing %s: %s",
>-				    OOM_ADJ_PATH, strerror(errno));
>-			else
>-				verbose("Set %s from %d to %d",
>-				    OOM_ADJ_PATH, oom_adj_save, OOM_ADJ_NOKILL);
>+	 for (i = 0; oom_adjust[i].path != NULL; i++) {
>+		oom_adj_path = oom_adjust[i].path;
>+		value = oom_adjust[i].value;
>+		if ((fp = fopen(oom_adj_path, "r+")) != NULL) {
>+			if (fscanf(fp, "%d", &oom_adj_save) != 1)
>+				verbose("error reading %s: %s", oom_adj_path,
>+				    strerror(errno));
>+			else {
>+				rewind(fp);
>+				if (fprintf(fp, "%d\n", value) <= 0)
>+					verbose("error writing %s: %s",
>+					   oom_adj_path, strerror(errno));
>+				else
>+					verbose("Set %s from %d to %d",
>+					   oom_adj_path, oom_adj_save, value);
>+			}
>+			fclose(fp);
>+			return;
> 		}
>-		fclose(fp);
> 	}
>+	oom_adj_path = NULL;
> }
> 
> /* Restore the saved OOM adjustment */
>@@ -250,13 +266,14 @@ oom_adjust_restore(void)
> 	FILE *fp;
> 
> 	debug3("%s", __func__);
>-	if (oom_adj_save == INT_MIN || (fp = fopen(OOM_ADJ_PATH, "w")) == NULL)
>+	if (oom_adj_save == INT_MIN || oom_adj_save == NULL ||
>+	    (fp = fopen(oom_adj_path, "w")) == NULL)
> 		return;
> 
> 	if (fprintf(fp, "%d\n", oom_adj_save) <= 0)
>-		verbose("error writing %s: %s", OOM_ADJ_PATH, strerror(errno));
>+		verbose("error writing %s: %s", oom_adj_path, strerror(errno));
> 	else
>-		verbose("Set %s to %d", OOM_ADJ_PATH, oom_adj_save);
>+		verbose("Set %s to %d", oom_adj_path, oom_adj_save);
> 
> 	fclose(fp);
> 	return;

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1838: 1957 | 1980