bin/183484: [PATCH] usr.bin/limits: make -e work without /proc

Stefan Neudorf BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj at bitmessage.ch
Wed Oct 30 14:30:02 UTC 2013


>Number:         183484
>Category:       bin
>Synopsis:       [PATCH] usr.bin/limits: make -e work without /proc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 14:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Neudorf
>Release:        
>Organization:
>Environment:
>Description:
>How-To-Repeat:
 $ tcsh
 > limits -e
  ulimit -t unlimited;
  ulimit -f unlimited;
  ulimit -d 33554432;
  ulimit -s 524288;
  ulimit -c unlimited;
  ulimit -m unlimited;
  ulimit -l 64;
  ulimit -u 8528;
  ulimit -n 117585;
  ulimit -b unlimited;
  ulimit -v unlimited;
  ulimit -p unlimited;
  ulimit -w unlimited;
  ulimit -k unlimited;
 > sudo mount /proc
 > limits -e
  limit cputime unlimited;
  limit filesize unlimited;
  limit datasize 33554432;
  limit stacksize 524288;
  limit coredumpsize unlimited;
  limit memoryuse unlimited;
  limit memorylocked 64;
  limit maxproc 8528;
  limit descriptors 117585;
  limit sbsize unlimited;
  limit vmemoryuse unlimited;
  limit pseudoterminals unlimited;
  limit swapuse unlimited;
  limit kqueues unlimited;
>Fix:
--- noprocdir.diff begins here ---
Index: usr.bin/limits/limits.c
===================================================================
--- usr.bin/limits/limits.c	(revision 257346)
+++ usr.bin/limits/limits.c	(working copy)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/user.h>
 #include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -704,27 +705,31 @@ getshelltype(void)
     pid_t ppid = getppid();
 
     if (ppid != 1) {
-	FILE * fp;
+	struct kinfo_proc kp;
 	struct stat st;
-	char procdir[MAXPATHLEN], buf[128];
-	int l = sprintf(procdir, "/proc/%ld/", (long)ppid);
+	char path[MAXPATHLEN];
 	char * shell = getenv("SHELL");
+	int mib[4];
+	size_t len;
 
 	if (shell != NULL && stat(shell, &st) != -1) {
 	    struct stat st1;
 
-	    strcpy(procdir+l, "file");
+	    mib[0] = CTL_KERN;
+	    mib[1] = KERN_PROC;
+	    mib[2] = KERN_PROC_PATHNAME;
+	    mib[3] = ppid;
+	    len = sizeof(path);
+	    sysctl(mib, 4, path, &len, NULL, 0);
 	    /* $SHELL is actual shell? */
-	    if (stat(procdir, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
+	    if (stat(path, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
 		return getshellbyname(shell);
 	}
-	strcpy(procdir+l, "status");
-	if (stat(procdir, &st) == 0 && (fp = fopen(procdir, "r")) != NULL) {
-	    char * p = fgets(buf, sizeof buf, fp)==NULL ? NULL : strtok(buf, " \t");
-	    fclose(fp);
-	    if (p != NULL)
-		return getshellbyname(p);
-	}
+	mib[2] = KERN_PROC_PID;
+	len = sizeof(kp);
+	sysctl(mib, 4, &kp, &len, NULL, 0);
+	if (kp.ki_comm != NULL)
+	    return getshellbyname(kp.ki_comm);
     }
     return SH_SH;
 }
--- noprocdir.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-bugs mailing list