[MERGED] libosmocore[master]: fix logging: log_set_category_filter() for internal DL* logg...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: fix logging: log_set_category_filter() for internal DL* logging cats
......................................................................


fix logging: log_set_category_filter() for internal DL* logging cats

In log_set_category_filter(), passing a negative index lead to memory
corruption. Particularly dangerous since the internal logging categories have
negative values.

Fix: apply map_subsys() to interpret negative values as internal logging
categories.

As a side effect, out-of-bounds logging categories will be mapped to DLGLOBAL
instead of being dropped.

Fix the expectations in logging_test to match the fixed bug.

While at it also guard against a NULL logging target.

Change-Id: Ib0725b22bc39498c6b3970a61eb3339cf56d19f1
---
M src/logging.c
M tests/logging/logging_test.err
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/logging.c b/src/logging.c
index d32ca43..b0bca54 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -577,8 +577,9 @@
 void log_set_category_filter(struct log_target *target, int category,
 			       int enable, int level)
 {
-	if (category >= osmo_log_info->num_cat)
+	if (!target)
 		return;
+	category = map_subsys(category);
 	target->categories[category].enabled = !!enable;
 	target->categories[category].loglevel = level;
 }
diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test.err
index 4527d83..17b3cad 100644
--- a/tests/logging/logging_test.err
+++ b/tests/logging/logging_test.err
@@ -6,3 +6,4 @@
 DLGLOBAL You should see this on DLGLOBAL (c)
 DLGLOBAL You should see this on DLGLOBAL (d)
 DLGLOBAL You should see this on DLGLOBAL (e)
+DLGLOBAL You should see this (DLGLOBAL on DEBUG)

-- 
To view, visit https://gerrit.osmocom.org/1421
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0725b22bc39498c6b3970a61eb3339cf56d19f1
Gerrit-PatchSet: 4
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder