RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-11 16:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libselinux: Ensure selabel_lookup_best_match links NULL terminated

Browse Source 
Ensure that the array of strings is NULL terminated to stop core
dumps. Also cleaned up code.

Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
This commit is contained in:
Richard Haines 2015-05-18 14:53:48 +01:00 committed by Stephen Smalley
parent f0a3dc22e5
commit fc12f93a13
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libselinux/utils/selabel_lookup_best_match.c
View File

@ -53,9 +53,8 @@ static mode_t string_to_mode(char *s)
int main(int argc, char **argv)
{
int raw = 0, mode = 0, rc, opt, i, num_links, string_size;
int raw = 0, mode = 0, rc, opt, i, num_links, string_len;
char *validate = NULL, *path = NULL, *context = NULL, *file = NULL;
char **links = NULL;
struct selabel_handle *hnd;
@ -93,19 +92,19 @@ int main(int argc, char **argv)
for (i = optind, num_links = 0; i < argc; i++, num_links++)
;
if (num_links != 0) {
links = malloc(sizeof(char *) * num_links);
if (num_links) {
links = calloc(num_links + 1, sizeof(char *));
if (links == NULL) {
fprintf(stderr, "ERROR: malloc failed.");
if (!links) {
fprintf(stderr, "ERROR: calloc failed.\n");
exit(1);
}
for (i = optind, num_links = 0; i < argc; i++, num_links++) {
string_size = strlen(argv[i]) + 1;
links[num_links] = malloc(string_size);
if (links[num_links] == NULL) {
fprintf(stderr, "ERROR: malloc failed.");
string_len = strlen(argv[i]) + 1;
links[num_links] = malloc(string_len);
if (!links[num_links]) {
fprintf(stderr, "ERROR: malloc failed.\n");
exit(1);
}
strcpy(links[num_links], argv[i]);
@ -123,15 +122,13 @@ int main(int argc, char **argv)
goto out;
}
switch (raw) {
case 1:
if (raw)
rc = selabel_lookup_best_match_raw(hnd, &context, path,
(const char **)links, mode);
break;
default:
else
rc = selabel_lookup_best_match(hnd, &context, path,
(const char **)links, mode);
}
selabel_close(hnd);
if (rc) {
@ -153,9 +150,10 @@ int main(int argc, char **argv)
printf("Best match context: %s\n", context);
freecon(context);
}
out:
if (num_links != 0) {
for (i = 0; i < num_links; i++)
if (links) {
for (i = 0; links[i]; i++)
free(links[i]);
free(links);
}