kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

acl: Fix allocation related issues.

Browse Source 
Add checks for allocation errors, cleanup and report failure when they
occur.

* ast_duplicate_acl_list: Replace log warnings with errors, add missing
  line-feed.
* ast_append_acl: Add missing line-feed to logger message.
* ast_append_ha: Avoid ast_strdupa in loop by moving debug message to
  separate function.
* ast_ha_join: Use two separate calls to ast_str_append to avoid using
  ast_strdupa in a loop.

Change-Id: Ia19eaaeb0b139ff7ce7b971c7550e85c8b78ab76
This commit is contained in:
Corey Farrell
2017-11-16 10:48:36 -05:00
parent b2c49d6c07
commit c4f11911ea
1 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
main/acl.c
View File

@@ -281,6 +281,12 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
while (start) {
current = ast_duplicate_ha(start); /* Create copy of this object */
if (!current) {
ast_free_ha(ret);
return NULL;
}
if (prev) {
prev->next = current; /* Link previous to this object */
}
@@ -318,7 +324,7 @@ struct ast_acl_list *ast_duplicate_acl_list(struct ast_acl_list *original)
}
if (!(clone = ast_calloc(1, sizeof(*clone)))) {
ast_log(LOG_WARNING, "Failed to allocate ast_acl_list struct while cloning an ACL\n");
ast_log(LOG_ERROR, "Failed to allocate ast_acl_list struct while cloning an ACL\n");
return NULL;
}
AST_LIST_HEAD_INIT(clone);
@@ -327,8 +333,10 @@ struct ast_acl_list *ast_duplicate_acl_list(struct ast_acl_list *original)
AST_LIST_TRAVERSE(original, current_cursor, list) {
if ((acl_new(&current_clone, current_cursor->name))) {
ast_log(LOG_WARNING, "Failed to allocate ast_acl struct while cloning an ACL.");
continue;
ast_log(LOG_ERROR, "Failed to allocate ast_acl struct while cloning an ACL.\n");
ast_free_acl_list(clone);
clone = NULL;
break;
}
/* Copy data from original ACL to clone ACL */
@@ -338,6 +346,15 @@ struct ast_acl_list *ast_duplicate_acl_list(struct ast_acl_list *original)
current_clone->is_realtime = current_cursor->is_realtime;
AST_LIST_INSERT_TAIL(clone, current_clone, list);
if (current_cursor->acl && !current_clone->acl) {
/* Deal with failure after adding to clone so we don't have to free
* current_clone separately. */
ast_log(LOG_ERROR, "Failed to duplicate HA list while cloning ACL.\n");
ast_free_acl_list(clone);
clone = NULL;
break;
}
}
AST_LIST_UNLOCK(original);
@@ -448,6 +465,8 @@ void ast_append_acl(const char *sense, const char *stuff, struct ast_acl_list **
if (error) {
*error = 1;
}
AST_LIST_UNLOCK(working_list);
return;
}
// Need to INSERT the ACL at the head here.
AST_LIST_INSERT_HEAD(working_list, acl, list);
@@ -477,7 +496,8 @@ void ast_append_acl(const char *sense, const char *stuff, struct ast_acl_list **
AST_LIST_TRAVERSE(working_list, current, list) {
if (!strcasecmp(current->name, tmp)) { /* ACL= */
/* Inclusion of the same ACL multiple times isn't a catastrophic error, but it will raise the error flag and skip the entry. */
ast_log(LOG_ERROR, "Named ACL '%s' occurs multiple times in ACL definition. Please update your ACL configuration.", tmp);
ast_log(LOG_ERROR, "Named ACL '%s' occurs multiple times in ACL definition. "
"Please update your ACL configuration.\n", tmp);
if (error) {
*error = 1;
}
@@ -536,6 +556,22 @@ int ast_acl_list_is_empty(struct ast_acl_list *acl_list)
return 1;
}
/*!
* \internal
* \brief Used by ast_append_ha to avoid ast_strdupa in a loop.
*
* \note This function is only called at debug level 3 and higher.
*/
static void debug_ha_sense_appended(struct ast_ha *ha)
{
const char *parsed_mask = ast_strdupa(ast_sockaddr_stringify(&ha->netmask));
ast_log(LOG_DEBUG, "%s/%s sense %u appended to ACL\n",
ast_sockaddr_stringify(&ha->addr),
parsed_mask,
ha->sense);
}
struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha *path, int *error)
{
struct ast_ha *ha;
@@ -545,7 +581,6 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
char *address = NULL, *mask = NULL;
int addr_is_v4;
int allowing = strncasecmp(sense, "p", 1) ? AST_SENSE_DENY : AST_SENSE_ALLOW;
const char *parsed_addr, *parsed_mask;
ret = path;
while (path) {
@@ -653,10 +688,9 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
}
prev = ha;
parsed_addr = ast_strdupa(ast_sockaddr_stringify(&ha->addr));
parsed_mask = ast_strdupa(ast_sockaddr_stringify(&ha->netmask));
ast_debug(3, "%s/%s sense %u appended to ACL\n", parsed_addr, parsed_mask, ha->sense);
if (DEBUG_ATLEAST(3)) {
debug_ha_sense_appended(ha);
}
}
return ret;
@@ -665,10 +699,11 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
void ast_ha_join(const struct ast_ha *ha, struct ast_str **buf)
{
for (; ha; ha = ha->next) {
const char *addr = ast_strdupa(ast_sockaddr_stringify_addr(&ha->addr));
ast_str_append(buf, 0, "%s%s/%s",
ha->sense == AST_SENSE_ALLOW ? "!" : "",
addr, ast_sockaddr_stringify_addr(&ha->netmask));
ast_str_append(buf, 0, "%s%s/",
ha->sense == AST_SENSE_ALLOW ? "!" : "",
ast_sockaddr_stringify_addr(&ha->addr));
/* Separated to avoid duplicating stringified addresses. */
ast_str_append(buf, 0, "%s", ast_sockaddr_stringify_addr(&ha->netmask));
if (ha->next) {
ast_str_append(buf, 0, ",");
}