1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
http://security.freebsd.org/advisories/FreeBSD-SA-08:01.pty.asc
Index: lib/libc/stdlib/grantpt.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/stdlib/grantpt.c,v
retrieving revision 1.4.10.1
diff -u -I__FBSDID -I$FreeBSD -r1.4.10.1 grantpt.c
--- lib/libc/stdlib/grantpt.c 18 Dec 2007 00:36:21 -0000 1.4.10.1
+++ lib/libc/stdlib/grantpt.c 10 Jan 2008 20:54:30 -0000
@@ -214,24 +214,30 @@
ptsname(int fildes)
{
static char slave[] = _PATH_DEV PTS_PREFIX "XY";
- char *retval;
+ const char *master;
struct stat sbuf;
- retval = NULL;
-
- if (_fstat(fildes, &sbuf) == 0) {
- if (!ISPTM(sbuf))
- errno = EINVAL;
- else {
- (void)snprintf(slave, sizeof(slave),
- _PATH_DEV PTS_PREFIX "%s",
- devname(sbuf.st_rdev, S_IFCHR) +
- strlen(PTM_PREFIX));
- retval = slave;
- }
- }
-
- return (retval);
+ /* All master pty's must be char devices. */
+ if (_fstat(fildes, &sbuf) == -1)
+ goto invalid;
+ if (!S_ISCHR(sbuf.st_mode))
+ goto invalid;
+
+ /* Check to see if this device is a pty(4) master. */
+ master = devname(sbuf.st_rdev, S_IFCHR);
+ if (strlen(master) != strlen(PTM_PREFIX "XY"))
+ goto invalid;
+ if (strncmp(master, PTM_PREFIX, strlen(PTM_PREFIX)) != 0)
+ goto invalid;
+
+ /* It is, so generate the corresponding pty(4) slave name. */
+ (void)snprintf(slave, sizeof(slave), _PATH_DEV PTS_PREFIX "%s",
+ master + strlen(PTM_PREFIX));
+ return (slave);
+
+invalid:
+ errno = EINVAL;
+ return (NULL);
}
/*
@@ -240,18 +246,14 @@
int
unlockpt(int fildes)
{
- int retval;
- struct stat sbuf;
/*
* Unlocking a master/slave pseudo-terminal pair has no meaning in a
* non-streams PTY environment. However, we do ensure fildes is a
* valid master pseudo-terminal device.
*/
- if ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) {
- errno = EINVAL;
- retval = -1;
- }
+ if (ptsname(fildes) == NULL)
+ return (-1);
- return (retval);
+ return (0);
}
Index: lib/libutil/pty.c
===================================================================
RCS file: /home/ncvs/src/lib/libutil/pty.c,v
retrieving revision 1.15.20.1
diff -u -I__FBSDID -I$FreeBSD -r1.15.20.1 pty.c
--- lib/libutil/pty.c 27 Nov 2007 18:43:09 -0000 1.15.20.1
+++ lib/libutil/pty.c 10 Jan 2008 20:54:30 -0000
@@ -76,8 +76,7 @@
break; /* try the next pty group */
} else {
line[5] = 't';
- (void) chown(line, getuid(), ttygid);
- (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);
+ (void) grantpt(master);
(void) revoke(line);
if ((slave = open(line, O_RDWR, 0)) != -1) {
*amaster = master;
|
GitWeb