blob: 09ba065a069798833daddc66dabbf016dc338f64 (
plain)
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
|
=== modified file 'chkutmp.c'
--- chkutmp.c 2008-10-06 19:07:51 +0000
+++ chkutmp.c 2007-10-20 07:56:19 +0000
@@ -23,6 +23,7 @@
*
* Changelog:
* Ighighi X - Improved speed via break command - 2005/03/27
+ * Stewart Gebbie - fixed buffer overrun bug related to MAXREAD and UT_PIDLENGTH - 2007-10-20
*
*/
@@ -42,7 +43,7 @@
#endif
#include <ctype.h>
-#define MAXREAD 1024
+#define MAXREAD 4096
#define MAXBUF 4096
#define MAXLENGTH 256
#define UT_PIDSIZE 12
@@ -57,13 +58,13 @@
#endif
struct ps_line {
- char ps_tty[UT_LINESIZE];
- char ps_user[UT_NAMESIZE];
- char ps_args[MAXLENGTH];
+ char ps_tty[UT_LINESIZE+1];
+ char ps_user[UT_NAMESIZE+1];
+ char ps_args[MAXLENGTH+1];
int ps_pid;
};
struct utmp_line {
- char ut_tty[UT_LINESIZE];
+ char ut_tty[UT_LINESIZE+1];
int ut_pid;
int ut_type;
};
@@ -77,7 +78,7 @@
int fetchps(struct ps_line *psl_p)
{
FILE *ps_fp;
- char line[MAXREAD + 1], pid[UT_PIDSIZE];
+ char line[MAXREAD + 1], pid[UT_PIDSIZE+1];
char *s, *d;
struct ps_line *curp = &psl_p[0];
struct ps_line *endp = &psl_p[MAXBUF];
@@ -97,7 +98,7 @@
while (isspace(*s)) /* skip spaces */
s++;
d = pid;
- for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_LINESIZE; x++) /* grab pid */
+ for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_PIDSIZE; x++) /* grab pid */
;
*d = '\0';
curp->ps_pid = atoi(pid);
|
GitWeb
