From 831d27a9f56da38cf007714c169d208e7b9739be Mon Sep 17 00:00:00 2001
From: Don Lewis <truckman@FreeBSD.org>
Date: Wed, 11 Nov 1998 10:04:13 +0000
Subject: Installed the second patch attached to kern/7899 with some changes
 suggested by bde, a few other tweaks to get the patch to apply cleanly again
 and some improvements to the comments.

This change closes some fairly minor security holes associated with
F_SETOWN, fixes a few bugs, and removes some limitations that F_SETOWN
had on tty devices.  For more details, see the description on the PR.

Because this patch increases the size of the proc and pgrp structures,
it is necessary to re-install the includes and recompile libkvm,
the vinum lkm, fstat, gcore, gdb, ipfilter, ps, top, and w.

PR:		kern/7899
Reviewed by:	bde, elvind
---
 sys/kern/sys_pipe.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'sys/kern/sys_pipe.c')

diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 5f6789752c28..b95cdd28e078 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.43 1998/10/13 08:24:40 dg Exp $
+ * $Id: sys_pipe.c,v 1.44 1998/10/28 13:36:58 dg Exp $
  */
 
 /*
@@ -256,7 +256,6 @@ pipeinit(cpipe)
 	cpipe->pipe_atime = cpipe->pipe_ctime;
 	cpipe->pipe_mtime = cpipe->pipe_ctime;
 	bzero(&cpipe->pipe_sel, sizeof cpipe->pipe_sel);
-	cpipe->pipe_pgid = NO_PID;
 
 #ifndef PIPE_NODIRECT
 	/*
@@ -315,12 +314,8 @@ pipeselwakeup(cpipe)
 		cpipe->pipe_state &= ~PIPE_SEL;
 		selwakeup(&cpipe->pipe_sel);
 	}
-	if (cpipe->pipe_state & PIPE_ASYNC) {
-		if (cpipe->pipe_pgid < 0)
-			gsignal(-cpipe->pipe_pgid, SIGIO);
-		else if ((p = pfind(cpipe->pipe_pgid)) != NULL)
-			psignal(p, SIGIO);
-	}
+	if ((cpipe->pipe_state & PIPE_ASYNC) && cpipe->pipe_sigio)
+		pgsigio(cpipe->pipe_sigio, SIGIO, 0);
 }
 
 /* ARGSUSED */
@@ -953,12 +948,20 @@ pipe_ioctl(fp, cmd, data, p)
 			*(int *)data = mpipe->pipe_buffer.cnt;
 		return (0);
 
-	case TIOCSPGRP:
-		mpipe->pipe_pgid = *(int *)data;
+	case FIOSETOWN:
+		return (fsetown(*(int *)data, &mpipe->pipe_sigio));
+
+	case FIOGETOWN:
+		*(int *)data = fgetown(mpipe->pipe_sigio);
 		return (0);
 
+	/* This is deprecated, FIOSETOWN should be used instead. */
+	case TIOCSPGRP:
+		return (fsetown(-(*(int *)data), &mpipe->pipe_sigio));
+
+	/* This is deprecated, FIOGETOWN should be used instead. */
 	case TIOCGPGRP:
-		*(int *)data = mpipe->pipe_pgid;
+		*(int *)data = -fgetown(mpipe->pipe_sigio);
 		return (0);
 
 	}
@@ -1038,6 +1041,7 @@ pipe_close(fp, p)
 {
 	struct pipe *cpipe = (struct pipe *)fp->f_data;
 
+	funsetown(cpipe->pipe_sigio);
 	pipeclose(cpipe);
 	fp->f_data = NULL;
 	return 0;
-- 
cgit v1.2.3