mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

we are not doing access control here, so replace the "check if file is

Browse Source 
executable" goo with access(2).

originally from jacekm@ long time ago.

"i can live with that" oga@
This commit is contained in:
okan 2009-08-25 02:02:59 +00:00
parent 1968561fcc
commit 0a44f2e5c4
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
kbfunc.c
View File

@ -228,14 +228,11 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
#define NPATHS 256 #define NPATHS 256
char **ap, *paths[NPATHS], *path, *pathcpy, *label; char **ap, *paths[NPATHS], *path, *pathcpy, *label;
char tpath[MAXPATHLEN]; char tpath[MAXPATHLEN];
int l, i, j, ngroups; int l, i;
gid_t mygroups[NGROUPS_MAX];
uid_t ruid, euid, suid;
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
struct stat sb;
int cmd = arg->i; int cmd = arg->i;
switch (cmd) { switch (cmd) {
@ -250,11 +247,6 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
/*NOTREACHED*/ /*NOTREACHED*/
} }
if (getgroups(0, mygroups) == -1)
err(1, "getgroups failure");
if ((ngroups = getresuid(&ruid, &euid, &suid)) == -1)
err(1, "getresuid failure");
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
if ((path = getenv("PATH")) == NULL) if ((path = getenv("PATH")) == NULL)
@ -281,32 +273,11 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
/* check for truncation etc */ /* check for truncation etc */
if (l == -1 || l >= (int)sizeof(tpath)) if (l == -1 || l >= (int)sizeof(tpath))
continue; continue;
/* just ignore on stat failure */ if (access(tpath, X_OK) == 0) {
if (stat(tpath, &sb) == -1) mi = xcalloc(1, sizeof(*mi));
continue; strlcpy(mi->text, dp->d_name, sizeof(mi->text));
/* may we execute this file? */ TAILQ_INSERT_TAIL(&menuq, mi, entry);
if (euid == sb.st_uid) {
if (sb.st_mode & S_IXUSR)
goto executable;
else
continue;
} }
for (j = 0; j < ngroups; j++) {
if (mygroups[j] == sb.st_gid) {
if (sb.st_mode & S_IXGRP)
goto executable;
else
continue;
}
}
if (sb.st_mode & S_IXOTH)
goto executable;
continue;
executable:
/* the thing in tpath, we may execute */
mi = xcalloc(1, sizeof(*mi));
strlcpy(mi->text, dp->d_name, sizeof(mi->text));
TAILQ_INSERT_TAIL(&menuq, mi, entry);
} }
(void)closedir(dirp); (void)closedir(dirp);
} }