mirror/libcap
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/libs/libcap/libcap.git synced 2026-01-27 01:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fruit of more static analysis results

Browse Source 
Fixes for further analysis issues from Zoltan Fridrich of Redhat.

Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
This commit is contained in:
Andrew G. Morgan 2021-04-22 20:06:32 -07:00
parent e3b0094c0d
commit b08b523364
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
progs/capsh.c
View File

@ -365,7 +365,7 @@ static char *find_self(const char *arg0)
goto free_parts;
}
for (i=0, p = parts; (dir = strtok(p, ":")); p = NULL) {
for (p = parts; (dir = strtok(p, ":")); p = NULL) {
sprintf(scratch, "%s/%s", dir, arg0);
if (access(scratch, X_OK) == 0) {
status = 0;
@ -385,6 +385,16 @@ free_parts:
return scratch;
}
static long safe_sysconf(int name)
{
long ans = sysconf(name);
if (ans <= 0) {
fprintf(stderr, "sysconf(%d) returned a non-positive number: %ld\n", name, ans);
exit(1);
}
return ans;
}
int main(int argc, char *argv[], char *envp[])
{
pid_t child;
@ -633,7 +643,9 @@ int main(int argc, char *argv[], char *envp[])
* Given we are now in a new directory tree, its good practice
* to start off in a sane location
*/
status = chdir("/");
if (status == 0) {
status = chdir("/");
}
cap_free(orig);
@ -734,14 +746,14 @@ int main(int argc, char *argv[], char *envp[])
gid_t *group_list;
int g_count;
length = sysconf(_SC_GETGR_R_SIZE_MAX);
length = safe_sysconf(_SC_GETGR_R_SIZE_MAX);
buf = calloc(1, length);
if (NULL == buf) {
fprintf(stderr, "No memory for [%s] operation\n", argv[i]);
exit(1);
}
max_groups = sysconf(_SC_NGROUPS_MAX);
max_groups = safe_sysconf(_SC_NGROUPS_MAX);
group_list = calloc(max_groups, sizeof(gid_t));
if (NULL == group_list) {
fprintf(stderr, "No memory for gid list\n");
@ -757,8 +769,7 @@ int main(int argc, char *argv[], char *envp[])
}
if (!isdigit(*ptr)) {
struct group *g, grp;
getgrnam_r(ptr, &grp, buf, length, &g);
if (NULL == g) {
if (getgrnam_r(ptr, &grp, buf, length, &g) || NULL == g) {
fprintf(stderr, "Failed to identify gid for group [%s]\n", ptr);
exit(1);
}
@ -851,6 +862,7 @@ int main(int argc, char *argv[], char *envp[])
argv[argc] = NULL;
execve(argv[i], argv+i, envp);
fprintf(stderr, "execve '%s' failed!\n", argv[i]);
free(argv[i]);
exit(1);
} else if (!strncmp("--shell=", argv[i], 8)) {
shell = argv[i]+8;

4
psx/psx.c
View File

@ -454,6 +454,10 @@ static void *_psx_start_fn(void *data) {
int __wrap_pthread_create(pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine) (void *), void *arg) {
psx_starter_t *starter = calloc(1, sizeof(psx_starter_t));
if (starter == NULL) {
perror("failed at thread creation");
exit(1);
}
starter->fn = start_routine;
starter->arg = arg;
/*

2
tests/libcap_launch_test.c
View File

@ -120,7 +120,7 @@ int main(int argc, char **argv) {
printf("[%d] test should %s\n", i,
v->result ? "generate error" : "work");
cap_launch_t attr;
if (v->args != NULL) {
if (v->args[0] != NULL) {
attr = cap_new_launcher(v->args[0], v->args, v->envp);
if (v->callback_fn != NULL) {
cap_launcher_callback(attr, v->callback_fn);