PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SebiderSushi reported that chmod g+s wasn't working.

Browse Source
This commit is contained in:
Rob Landley 2020-01-06 12:48:28 -06:00
parent c87487ffd9
commit c25ff2dde8
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/lib.c
View File

@ -922,12 +922,12 @@ mode_t string_to_mode(char *modestr, mode_t mode)
// If who isn't specified, like "a" but honoring umask.
if (!dowho) {
dowho = 8;
umask(amask=umask(0));
umask(amask = umask(0));
}
if (!*str || !(s = strchr(hows, *str))) goto barf;
dohow = *(str++);
if (!dohow) goto barf;
if (!*str || !(s = strchr(hows, *str))) goto barf;
if (!(dohow = *(str++))) goto barf;
while (*str && (s = strchr(whats, *str))) {
dowhat |= 1<<(s-whats);
str++;
@ -945,7 +945,7 @@ mode_t string_to_mode(char *modestr, mode_t mode)
// Are we ready to do a thing yet?
if (*str && *(str++) != ',') goto barf;
// Ok, apply the bits to the mode.
// Loop through what=xwrs and who=ogu to apply bits to the mode.
for (i=0; i<4; i++) {
for (j=0; j<3; j++) {
mode_t bit = 0;
@ -955,13 +955,12 @@ mode_t string_to_mode(char *modestr, mode_t mode)
// Figure out new value at this location
if (i == 3) {
// suid/sticky bit.
if (j) {
if ((dowhat & 8) && (dowho&(8|(1<<i)))) bit++;
} else if (dowhat & 16) bit++;
// suid and sticky
if (!j) bit = dowhat&16; // o+s = t
else if ((dowhat&8) && (dowho&(8|(1<<j)))) bit++;
} else {
if (!(dowho&(8|(1<<i)))) continue;
if (dowhat&(1<<j)) bit++;
else if (dowhat&(1<<j)) bit++;
}
// When selection active, modify bit

4
tests/chmod.test
View File

@ -107,6 +107,10 @@ chtest +x "drwxr-xr-x\n-rwxr-xr-x\n"
chtest -r "d-wx--x--x\n--w-------\n"
chtest -w "dr-xr-xr-x\n-r--r--r--\n"
chtest -x "drw-r--r--\n-rw-r--r--\n"
chtest g+s "drwxr-sr-x\n-rw-r-Sr--\n"
chtest u+s "drwsr-xr-x\n-rwSr--r--\n"
chtest o+s "drwxr-xr-x\n-rw-r--r--\n"
chtest +t "drwxr-xr-t\n-rw-r--r-T\n"
# Removing test files for cleanup purpose
rm -rf dir file