OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

logging: When strings are stripped keep source name pointers 

90ab94f61d added a change that source name pointers were not stored
in the const data structure associated with a logging source. That was
done because those string pointers were invalid (on purpose pointing to
non-existing memory) and reading those strings could lead to a fault.
However, those pointers are used by scripts which are building the
dictionary database and after this change script was no longer
able to retrieve source names from elf file and database was incomplete.

This patch brings back storing of source name string pointers but in
API for reading those source names guards are added to not return
invalid addresses.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruściński 2024-08-09 13:13:33 +02:00 committed by Carles Cufí
parent c2151ad1e3
commit e18254901c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/zephyr/logging/log.h
View File

@ -328,8 +328,7 @@ void z_log_vprintk(const char *fmt, va_list ap);
log_source_const_data, \
Z_LOG_ITEM_CONST_DATA(_name)) = \
{ \
.name = IS_ENABLED(CONFIG_LOG_FMT_SECTION_STRIP) ? NULL : \
COND_CODE_1(CONFIG_LOG_FMT_SECTION, \
.name = COND_CODE_1(CONFIG_LOG_FMT_SECTION, \
(UTIL_CAT(_name, _str)), (STRINGIFY(_name))), \
.level = (_level) \
}

7
subsys/logging/log_mgmt.c
View File

@ -243,6 +243,9 @@ static const char *link_source_name_get(uint8_t domain_id, uint32_t source_id)
const char *log_source_name_get(uint32_t domain_id, uint32_t source_id)
{
if (z_log_is_local_domain(domain_id)) {
if (IS_ENABLED(CONFIG_LOG_FMT_SECTION_STRIP)) {
return "unknown";
}
if (source_id < log_src_cnt_get(domain_id)) {
return TYPE_SECTION_START(log_const)[source_id].name;
} else {
@ -362,6 +365,10 @@ void z_log_runtime_filters_init(void)
int log_source_id_get(const char *name)
{
if (IS_ENABLED(CONFIG_LOG_FMT_SECTION_STRIP)) {
return -1;
}
for (int i = 0; i < log_src_cnt_get(Z_LOG_LOCAL_DOMAIN_ID); i++) {
const char *sname = log_source_name_get(Z_LOG_LOCAL_DOMAIN_ID, i);