isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unload group plugin if its init function fails.

Browse Source
This commit is contained in:
Todd C. Miller
2010-11-08 17:44:32 -05:00
parent 01dcbfce70
commit da35e5f42f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/sudoers/group_plugin.c
View File

@@ -72,7 +72,7 @@ group_plugin_load(char *plugin_info)
struct stat sb; struct stat sb;
char *args, path[PATH_MAX]; char *args, path[PATH_MAX];
char **argv = NULL; char **argv = NULL;
int len, rc; int len, rc = -1;
/* /*
* Fill in .so path and split out args (if any). * Fill in .so path and split out args (if any).
@@ -91,40 +91,40 @@ group_plugin_load(char *plugin_info)
warningx("%s%s: %s", warningx("%s%s: %s",
(*plugin_info != '/') ? _PATH_SUDO_PLUGIN_DIR : "", plugin_info, (*plugin_info != '/') ? _PATH_SUDO_PLUGIN_DIR : "", plugin_info,
strerror(ENAMETOOLONG)); strerror(ENAMETOOLONG));
return -1; goto done;
} }
/* Sanity check plugin path. */ /* Sanity check plugin path. */
if (stat(path, &sb) != 0) { if (stat(path, &sb) != 0) {
warning("%s", path); warning("%s", path);
return -1; goto done;
} }
if (sb.st_uid != ROOT_UID) { if (sb.st_uid != ROOT_UID) {
warningx("%s must be owned by uid %d", path, ROOT_UID); warningx("%s must be owned by uid %d", path, ROOT_UID);
return -1; goto done;
} }
if ((sb.st_mode & (S_IWGRP|S_IWOTH)) != 0) { if ((sb.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
warningx("%s must be only be writable by owner", path); warningx("%s must be only be writable by owner", path);
return -1; goto done;
} }
/* Open plugin and map in symbol. */ /* Open plugin and map in symbol. */
group_handle = dlopen(path, RTLD_LAZY|RTLD_LOCAL); group_handle = dlopen(path, RTLD_LAZY|RTLD_LOCAL);
if (!group_handle) { if (!group_handle) {
warningx("unable to dlopen %s: %s", path, dlerror()); warningx("unable to dlopen %s: %s", path, dlerror());
return -1; goto done;
} }
group_plugin = dlsym(group_handle, "group_plugin"); group_plugin = dlsym(group_handle, "group_plugin");
if (group_plugin == NULL) { if (group_plugin == NULL) {
warningx("unable to find symbol \"group_plugin\" in %s", path); warningx("unable to find symbol \"group_plugin\" in %s", path);
return -1; goto done;
} }
if (GROUP_API_VERSION_GET_MAJOR(group_plugin->version) != GROUP_API_VERSION_MAJOR) { if (GROUP_API_VERSION_GET_MAJOR(group_plugin->version) != GROUP_API_VERSION_MAJOR) {
warningx("%s: incompatible group plugin major version %d, expected %d", warningx("%s: incompatible group plugin major version %d, expected %d",
path, GROUP_API_VERSION_GET_MAJOR(group_plugin->version), path, GROUP_API_VERSION_GET_MAJOR(group_plugin->version),
GROUP_API_VERSION_MAJOR); GROUP_API_VERSION_MAJOR);
return -1; goto done;
} }
/* /*
@@ -152,8 +152,16 @@ group_plugin_load(char *plugin_info)
rc = (group_plugin->init)(GROUP_API_VERSION, sudo_printf, argv); rc = (group_plugin->init)(GROUP_API_VERSION, sudo_printf, argv);
done:
efree(argv); efree(argv);
if (rc != 0) {
if (group_handle != NULL) {
dlclose(group_handle);
group_handle = NULL;
}
}
return rc; return rc;
} }