svn commit: r254096 - in stable: 8/sys/dev/filemon 9/sys/dev/filemon

[Hiroki Sato]

Author: hrs
Date: Thu Aug  8 17:20:09 2013
New Revision: 254096
URL: http://svnweb.freebsd.org/changeset/base/254096

Log:
  MFC 253887,253977:
  
  - Use pget(PGET_CANDEBUG | PGET_NOTWEXIT) to determine if the specified
    PID is valid for monitoring in FILEMON_SET_PID ioctl.
  
  - Set the monitored PID to -1 when the process exits.
  
  Suggested by:	jilles
  Tested by:	sjg

Modified:
  stable/8/sys/dev/filemon/filemon.c
  stable/8/sys/dev/filemon/filemon_wrapper.c
Directory Properties:
  stable/8/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/dev/filemon/filemon.c
  stable/9/sys/dev/filemon/filemon_wrapper.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/8/sys/dev/filemon/filemon.c
==============================================================================
--- stable/8/sys/dev/filemon/filemon.c	Thu Aug  8 16:09:20 2013	(r254095)
+++ stable/8/sys/dev/filemon/filemon.c	Thu Aug  8 17:20:09 2013	(r254096)
@@ -180,6 +180,7 @@ filemon_ioctl(struct cdev *dev, u_long c
 {
 	int error = 0;
 	struct filemon *filemon;
+	struct proc *p;
 
 #if __FreeBSD_version < 701000
 	filemon = dev->si_drv1;
@@ -202,7 +203,12 @@ filemon_ioctl(struct cdev *dev, u_long c
 
 	/* Set the monitored process ID. */
 	case FILEMON_SET_PID:
-		filemon->pid = *((pid_t *) data);
+		error = pget(*((pid_t *)data), PGET_CANDEBUG | PGET_NOTWEXIT,
+		    &p);
+		if (error == 0) {
+			filemon->pid = p->p_pid;
+			PROC_UNLOCK(p);
+		}
 		break;
 
 	default:

Modified: stable/8/sys/dev/filemon/filemon_wrapper.c
==============================================================================
--- stable/8/sys/dev/filemon/filemon_wrapper.c	Thu Aug  8 16:09:20 2013	(r254095)
+++ stable/8/sys/dev/filemon/filemon_wrapper.c	Thu Aug  8 17:20:09 2013	(r254096)
@@ -574,6 +574,7 @@ filemon_wrapper_sys_exit(struct thread *
 			    (uintmax_t)now.tv_sec, (uintmax_t)now.tv_usec);
 
 			filemon_output(filemon, filemon->msgbufr, len);
+			filemon->pid = -1;
 		}
 
 		/* Unlock the found filemon structure. */