d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly scrub telnetd's environment.

Browse Source 
Approved by:	so (cperciva)
Security:	FreeBSD-SA-09:05.telnetd
This commit is contained in:
Colin Percival 2009-02-16 21:56:17 +00:00
parent 78c0a9c9e2
commit 3a5733c67b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=188699
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/telnet/telnetd/sys_term.c
View File

@ -1271,8 +1271,18 @@ scrub_env(void)
char **cpp, **cpp2; char **cpp, **cpp2;
const char **p; const char **p;
char ** new_environ;
for (cpp2 = cpp = environ; *cpp; cpp++) { size_t count;
/* Allocate space for scrubbed environment. */
for (count = 1, cpp = environ; *cpp; count++, cpp++)
continue;
if ((new_environ = malloc(count * sizeof(char *))) == NULL) {
environ = NULL;
return;
}
for (cpp2 = new_environ, cpp = environ; *cpp; cpp++) {
int reject_it = 0; int reject_it = 0;
for(p = rej; *p; p++) for(p = rej; *p; p++)
@ -1286,10 +1296,15 @@ scrub_env(void)
for(p = acc; *p; p++) for(p = acc; *p; p++)
if(strncmp(*cpp, *p, strlen(*p)) == 0) if(strncmp(*cpp, *p, strlen(*p)) == 0)
break; break;
if(*p != NULL) if(*p != NULL) {
*cpp2++ = *cpp; if ((*cpp2++ = strdup(*cpp)) == NULL) {
environ = new_environ;
return;
}
}
} }
*cpp2 = NULL; *cpp2 = NULL;
environ = new_environ;
} }
/* /*