Attachment 108535 Details for Bug 138788 – Updated patch for SysVinit-2.84 to support symlinks as prog args

Updated patch for SysVinit-2.84 to support symlinks as prog args

nfs_block_v2_SysVinit-2.84.patch (text/plain), 2.30 KB, created by Constantine Gavrilov on 2004-12-14 17:00:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Constantine Gavrilov

Created: 2004-12-14 17:00:40 UTC

Size: 2.30 KB

patch

obsolete

>--- src/killall5.c	Tue Jul 31 10:06:27 2001
>+++ /root/killall5.c	Tue Dec 14 11:47:36 2004
>@@ -48,8 +48,7 @@
>   char *fullname;	/* Name as found out from argv[0] */
>   char *basename;	/* Only the part after the last / */
>   char *statname;	/* the statname without braces    */
>-  ino_t ino;		/* Inode number			  */
>-  dev_t dev;		/* Device it is on		  */
>+  char *exename;    /* exename from /proc/pid/exe   */
>   pid_t pid;		/* Process ID.			  */
>   int sid;		/* Session ID.			  */
>   struct _proc_ *next;	/* Pointer to next struct. 	  */
>@@ -151,7 +150,6 @@
> 	FILE *fp;
> 	int pid, f;
> 	PROC *p, *n;
>-	struct stat st;
> 	int c;
> 
> 	/* Open the /proc directory. */
>@@ -165,6 +163,7 @@
> 	for (p = plist; n; p = n) {
> 		n = p->next;
> 		if (p->fullname) free(p->fullname);
>+		if (p->exename)  free(p->exename);
> 		free(p);
> 	}
> 	plist = NULL;
>@@ -217,6 +216,7 @@
> 				p->sid = 0;
> 				nsyslog(LOG_ERR, "can't read sid from %s\n",
> 					path);
>+				free(p->statname);
> 				free(p);
> 				continue;
> 			}
>@@ -247,17 +247,22 @@
> 				p->basename = p->fullname;
> 		} else {
> 			/* Process disappeared.. */
>+			free(p->statname);
> 			free(p);
> 			continue;
> 		}
> 
> 		/* Try to stat the executable. */
> 		snprintf(path, sizeof(path), "/proc/%s/exe", d->d_name);
>-		if (stat(path, &st) == 0) {
>-			p->dev = st.st_dev;
>-			p->ino = st.st_ino;
>+		p->exename = (char *)xmalloc(PATH_MAX);
>+		/* readlink never blocks, even on NFS */
>+		if(readlink(path, p->exename, PATH_MAX) < 0) {
>+			free(p->statname);
>+			free(p->exename);
>+			free(p);
>+			continue;
> 		}
>-
>+		
> 		/* Link it into the list. */
> 		p->next = plist;
> 		plist = p;
>@@ -318,16 +323,16 @@
> /* Try to get the process ID of a given process. */
> PIDQ *pidof(char *prog)
> {
>-	struct stat st;
> 	int dostat = 0;
> 	PROC *p;
> 	PIDQ *q;
> 	char *s;
> 	int foundone = 0;
> 	int ok = 0;
>+	char real_path[4096];
> 
> 	/* Try to stat the executable. */
>-	if (prog[0] == '/' && stat(prog, &st) == 0) dostat++;
>+	if (prog[0] == '/' && realpath(prog, real_path)) dostat++;
> 
> 	/* Get basename of program. */
> 	if ((s = strrchr(prog, '/')) == NULL)
>@@ -341,7 +346,7 @@
> 	/* First try to find a match based on dev/ino pair. */
> 	if (dostat) {
> 		for (p = plist; p; p = p->next) {
>-			if (p->dev == st.st_dev && p->ino == st.st_ino) {
>+			if (strcmp(real_path, p->exename) == 0) {
> 				add_pid_to_q(q, p);
> 				foundone++;
> 			}

Actions: View

Attachments on bug 138788: 106475 | 106478 | 108533 | 108534 | 108535 | 113650