mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 15:25:58 +00:00
Code Issues Releases Wiki Activity

Plug memory leak if there are duplicate user_info entries.

Browse Source
This commit is contained in:
Todd C. Miller
2021-02-12 19:04:37 -07:00
parent eedc72d7b9
commit ed79627699
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/sudoers/policy.c
View File

@@ -362,6 +362,7 @@ sudoers_policy_deserialize_info(void *v)
for (cur = info->user_info; *cur != NULL; cur++) { for (cur = info->user_info; *cur != NULL; cur++) {
if (MATCHES(*cur, "user=")) { if (MATCHES(*cur, "user=")) {
CHECK(*cur, "user="); CHECK(*cur, "user=");
free(user_name);
if ((user_name = strdup(*cur + sizeof("user=") - 1)) == NULL) if ((user_name = strdup(*cur + sizeof("user=") - 1)) == NULL)
goto oom; goto oom;
continue; continue;
@@ -391,12 +392,14 @@ sudoers_policy_deserialize_info(void *v)
} }
if (MATCHES(*cur, "cwd=")) { if (MATCHES(*cur, "cwd=")) {
CHECK(*cur, "cwd="); CHECK(*cur, "cwd=");
free(user_cwd);
if ((user_cwd = strdup(*cur + sizeof("cwd=") - 1)) == NULL) if ((user_cwd = strdup(*cur + sizeof("cwd=") - 1)) == NULL)
goto oom; goto oom;
continue; continue;
} }
if (MATCHES(*cur, "tty=")) { if (MATCHES(*cur, "tty=")) {
CHECK(*cur, "tty="); CHECK(*cur, "tty=");
free(user_ttypath);
if ((user_ttypath = strdup(*cur + sizeof("tty=") - 1)) == NULL) if ((user_ttypath = strdup(*cur + sizeof("tty=") - 1)) == NULL)
goto oom; goto oom;
user_tty = user_ttypath; user_tty = user_ttypath;
@@ -406,6 +409,9 @@ sudoers_policy_deserialize_info(void *v)
} }
if (MATCHES(*cur, "host=")) { if (MATCHES(*cur, "host=")) {
CHECK(*cur, "host="); CHECK(*cur, "host=");
if (user_shost != user_host)
free(user_shost);
free(user_host);
if ((user_host = strdup(*cur + sizeof("host=") - 1)) == NULL) if ((user_host = strdup(*cur + sizeof("host=") - 1)) == NULL)
goto oom; goto oom;
if ((p = strchr(user_host, '.')) != NULL) { if ((p = strchr(user_host, '.')) != NULL) {
@@ -475,6 +481,9 @@ sudoers_policy_deserialize_info(void *v)
goto bad; goto bad;
} }
if (user_srunhost != user_runhost)
free(user_srunhost);
free(user_runhost);
if ((user_runhost = strdup(remhost ? remhost : user_host)) == NULL) if ((user_runhost = strdup(remhost ? remhost : user_host)) == NULL)
goto oom; goto oom;
if ((p = strchr(user_runhost, '.')) != NULL) { if ((p = strchr(user_runhost, '.')) != NULL) {
@@ -489,8 +498,8 @@ sudoers_policy_deserialize_info(void *v)
goto oom; goto oom;
} }
if (user_runcwd == NULL) { if (user_runcwd == NULL) {
if ((user_runcwd = strdup(user_cwd)) == NULL) /* Unlike user_cwd, user_runcwd is not free()d. */
goto oom; user_runcwd = user_cwd;
} }
if (user_tty == NULL) { if (user_tty == NULL) {
if ((user_tty = strdup("unknown")) == NULL) if ((user_tty = strdup("unknown")) == NULL)