michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: fix error handling in link_filters_init

Browse source 
If k_malloc() of filters fails in log_mgmt.c:link_filters_init(),
return an error and do not rely on the __ASSERT(0).

If __ASSERT_ON==0 in the build, assert will not trigger and
code will proceed to execute

  memset(NULL, 0, sizeof(uint32_t) * total_cnt);

Avoid this by returning -ENOMEM on error.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2022-12-22 12:43:03 +02:00 • committed by Carles Cufí
commit 0368b49ea7
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
subsys/logging/log_mgmt.c
View file

@ -137,6 +137,7 @@ static int link_filters_init(const struct log_link *link)
if (link->ctrl_blk->filters == NULL) {
LOG_ERR("Failed to allocate buffer for runtime filtering.");
__ASSERT(0, "Failed to allocate buffer.");
return -ENOMEM;
}
memset(link->ctrl_blk->filters, 0, sizeof(uint32_t) * total_cnt);