uid.c: make use of RVAL_DECODED

* uid.c (sys_setuid, sys_setreuid, sys_setresuid, sys_chown, sys_fchown,
sys_setgroups): Update for RVAL_DECODED.
This commit is contained in:
Дмитрий Левин 2015-07-16 00:01:25 +00:00
parent 288a87049c
commit 14278620c9

140
uid.c
View File

@ -55,10 +55,9 @@ SYS_FUNC(setfsuid)
SYS_FUNC(setuid) SYS_FUNC(setuid)
{ {
if (entering(tcp)) { printuid("", tcp->u_arg[0]);
tprintf("%u", (uid_t) tcp->u_arg[0]);
} return RVAL_DECODED;
return 0;
} }
static void static void
@ -85,41 +84,37 @@ SYS_FUNC(getresuid)
SYS_FUNC(setreuid) SYS_FUNC(setreuid)
{ {
if (entering(tcp)) { printuid("", tcp->u_arg[0]);
printuid("", tcp->u_arg[0]); printuid(", ", tcp->u_arg[1]);
printuid(", ", tcp->u_arg[1]);
} return RVAL_DECODED;
return 0;
} }
SYS_FUNC(setresuid) SYS_FUNC(setresuid)
{ {
if (entering(tcp)) { printuid("", tcp->u_arg[0]);
printuid("", tcp->u_arg[0]); printuid(", ", tcp->u_arg[1]);
printuid(", ", tcp->u_arg[1]); printuid(", ", tcp->u_arg[2]);
printuid(", ", tcp->u_arg[2]);
} return RVAL_DECODED;
return 0;
} }
SYS_FUNC(chown) SYS_FUNC(chown)
{ {
if (entering(tcp)) { printpath(tcp, tcp->u_arg[0]);
printpath(tcp, tcp->u_arg[0]); printuid(", ", tcp->u_arg[1]);
printuid(", ", tcp->u_arg[1]); printuid(", ", tcp->u_arg[2]);
printuid(", ", tcp->u_arg[2]);
} return RVAL_DECODED;
return 0;
} }
SYS_FUNC(fchown) SYS_FUNC(fchown)
{ {
if (entering(tcp)) { printfd(tcp, tcp->u_arg[0]);
printfd(tcp, tcp->u_arg[0]); printuid(", ", tcp->u_arg[1]);
printuid(", ", tcp->u_arg[1]); printuid(", ", tcp->u_arg[2]);
printuid(", ", tcp->u_arg[2]);
} return RVAL_DECODED;
return 0;
} }
void void
@ -133,54 +128,53 @@ printuid(const char *text, const unsigned int uid)
SYS_FUNC(setgroups) SYS_FUNC(setgroups)
{ {
if (entering(tcp)) { unsigned long cur, abbrev_end;
unsigned long cur, abbrev_end; uid_t gid;
uid_t gid; int failed = 0;
int failed = 0; const unsigned long len = tcp->u_arg[0];
const unsigned long len = tcp->u_arg[0]; const unsigned long start = tcp->u_arg[1];
const unsigned long start = tcp->u_arg[1]; const unsigned long size = len * sizeof(gid);
const unsigned long size = len * sizeof(gid); const unsigned long end = start + size;
const unsigned long end = start + size;
tprintf("%lu, ", len); tprintf("%lu, ", len);
if (len == 0) { if (len == 0) {
tprints("[]"); tprints("[]");
return 0; return RVAL_DECODED;
}
if (!start || !verbose(tcp) ||
size / sizeof(gid) != len || end < start) {
printaddr(start);
return 0;
}
if (abbrev(tcp)) {
abbrev_end = start + max_strlen * sizeof(gid);
if (abbrev_end < start)
abbrev_end = end;
} else {
abbrev_end = end;
}
tprints("[");
for (cur = start; cur < end; cur += sizeof(gid)) {
if (cur > start)
tprints(", ");
if (cur >= abbrev_end) {
tprints("...");
break;
}
if (umoven(tcp, cur, sizeof(gid), &gid) < 0) {
tprints("?");
failed = 1;
break;
}
tprintf("%u", (unsigned int) gid);
}
tprints("]");
if (failed) {
tprints(" ");
printaddr(start);
}
} }
return 0; if (!start || !verbose(tcp) ||
size / sizeof(gid) != len || end < start) {
printaddr(start);
return RVAL_DECODED;
}
if (abbrev(tcp)) {
abbrev_end = start + max_strlen * sizeof(gid);
if (abbrev_end < start)
abbrev_end = end;
} else {
abbrev_end = end;
}
tprints("[");
for (cur = start; cur < end; cur += sizeof(gid)) {
if (cur > start)
tprints(", ");
if (cur >= abbrev_end) {
tprints("...");
break;
}
if (umoven(tcp, cur, sizeof(gid), &gid) < 0) {
tprints("?");
failed = 1;
break;
}
tprintf("%u", (unsigned int) gid);
}
tprints("]");
if (failed) {
tprints(" ");
printaddr(start);
}
return RVAL_DECODED;
} }
SYS_FUNC(getgroups) SYS_FUNC(getgroups)