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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
$NetBSD: patch-ac,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
Minor security audit - the world has moved on since 1994.
--- untcx.c 2003/06/20 07:59:56 1.1
+++ untcx.c 2003/06/20 08:09:26
@@ -166,9 +166,9 @@
/* Set global paths */
- (void)sprintf(logpath, "%s/log", ENFSDIR);
- (void)sprintf(logtmppath, "%s/logtmp", ENFSDIR);
- (void)sprintf(lockpath, "%s/.lock", ENFSDIR);
+ (void)snprintf(logpath, sizeof(logpath), "%s/log", ENFSDIR);
+ (void)snprintf(logtmppath, sizeof(logtmppath), "%s/logtmp", ENFSDIR);
+ (void)snprintf(lockpath, sizeof(lockpath), "%s/.lock", ENFSDIR);
/* Check and start tcxd as required */
@@ -185,16 +185,16 @@
/* Grab argv[0] and resolve to full path name via getwd() */
- if(getwd(cwd) == NULL)
+ if(getcwd(cwd, sizeof(cwd)) == NULL)
{
(void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
exit(-1);
}
if(*argv[0] == '/')
- (void)strcpy(realdir, argv[0]);
+ (void)strlcpy(realdir, argv[0], sizeof(realdir));
else
- (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
+ (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
for(;;)
{
if((c = strrchr(realdir, '/')) == NULL)
@@ -203,7 +203,7 @@
exit(-1);
}
c++;
- (void)strcpy(execname, c);
+ (void)strlcpy(execname, c, sizeof(execname));
*c = '\0';
if(chdir(realdir) < 0) /* Oops. Failed. Report and quit. */
@@ -212,7 +212,7 @@
exit(-1);
}
- if(getwd(realdir) == NULL)
+ if(getcwd(realdir, sizeof(realdir)) == NULL)
{
(void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
exit(-1);
@@ -238,11 +238,11 @@
}
execpath[len] = '\0';
if(execpath[0] == '/')
- (void)strcpy(realdir, execpath);
+ (void)strlcpy(realdir, execpath, sizeof(realdir));
else
{
- (void)strcat(realdir, "/");
- (void)strcat(realdir, execpath);
+ (void)strlcat(realdir, "/", sizeof(realdir));
+ (void)strlcat(realdir, execpath, sizeof(realdir));
}
continue;
}
@@ -291,8 +291,8 @@
#else
if(setreuid(getuid(), getuid()) < 0) { perror("setreuid"); exit(-1); }
#endif
- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
just_untcx(tcxtarg, untcxtmp);
exit(0);
}
@@ -302,8 +302,8 @@
if(local)
{
- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
untcx_and_exec_local(tcxtarg, untcxtmp, &(argv[1]));
}
#endif
@@ -315,7 +315,7 @@
for(c = realdir; *c ; c++)
if(*c == '/')
*c = '=';
- (void)sprintf(tcxtarg, "%s/%s", ENFSDIR, realdir);
+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", ENFSDIR, realdir);
if(mkdir(tcxtarg, 0777) < 0)
if(errno != EEXIST)
{
@@ -323,9 +323,9 @@
exit(-1);
}
(void)chmod(tcxtarg, 0777);
- (void)strcat(tcxtarg,"/");
- (void)strcat(tcxtarg, execname);
- (void)sprintf(untcxtmp, "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
+ (void)strlcat(tcxtarg,"/", sizeof(tcxtarg));
+ (void)strlcat(tcxtarg, execname, sizeof(tcxtarg));
+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
untcx_and_exec_nfs(argv[0], untcxtmp, tcxtarg, &(argv[1]));
@@ -415,7 +415,7 @@
/* Write our process id to the lock file. Don't really care if fails. */
- (void)sprintf(spid, "%d\n", getpid());
+ (void)snprintf(spid, sizeof(spid), "%d\n", getpid());
(void)write(lkfd, spid, strlen(spid));
#ifdef UNPACK_IN_PLACE
@@ -810,30 +810,30 @@
/* resolve first stage of argv[0] */
- if(getwd(cwd) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
+ if(getcwd(cwd, sizeof(cwd)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
- if(*argv[0] == '/') (void)strcpy(realdir, argv[0]); else (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
+ if(*argv[0] == '/') (void)strlcpy(realdir, argv[0], sizeof(realdir)); else (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
if((c = strrchr(realdir, '/')) == NULL) { (void)fprintf(stderr, "Help! Internal corruption of variables!\n"); exit(-1); }
- c++; (void)strcpy(execname, c); *c = '\0';
+ c++; (void)strlcpy(execname, c, sizeof(execname)); *c = '\0';
if(chdir(realdir) < 0) { perror(realdir); exit(-1); }
- if(getwd(realdir) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
+ if(getcwd(realdir, sizeof(realdir)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
for(c = realdir; *c; c++)
if(*c == '/')
*c = '=';
- (void)sprintf(linkpath, "%s/%s", ENFSDIR, realdir);
+ (void)snprintf(linkpath, sizeof(linkpath), "%s/%s", ENFSDIR, realdir);
if(mkdir(linkpath, 0777) < 0)
{
if(errno != EEXIST) { perror(linkpath); exit(-1); }
}
else
(void)chmod(linkpath, 0777);
- (void)strcat(linkpath,"/");
- (void)strcat(linkpath, execname);
+ (void)strlcat(linkpath,"/", sizeof(linkpath));
+ (void)strlcat(linkpath, execname, sizeof(linkpath));
if(chdir(cwd) < 0) { perror(cwd); exit(-1); }
@@ -1244,7 +1244,7 @@
if((curr = (path *)malloc(sizeof(path))) == NULL)
continue;
- (void)strcpy(curr->path, newpath);
+ (void)strlcpy(curr->path, newpath, sizeof(curr->path));
#ifdef UNPACK_IN_PLACE
curr->pid = -1;
(strstr(newpath, ENFSDIR) == newpath) ? (curr->local = 0) : (curr->local = 1);
|
