osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

logging.c: Sanitize calls to osmo_fd_unregister() 

It makes no sense to call osmo_fd_unregister() on a negative fd.
Let's also make sure we set fd to negative value after unregistering +
closing, even if the struct is going to be freed afterwards.

Change-Id: I0790a63e603028c11cc475d483c6528e4d9aa9ab
This commit is contained in:
Pau Espin 2023-03-14 14:32:46 +01:00
parent ff666997b2
commit fc37650381
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/logging.c
View File

@ -1161,6 +1161,7 @@ int log_target_file_switch_to_stream(struct log_target *target)
if (target->type == LOG_TGT_TYPE_FILE) {
osmo_fd_unregister(&wq->bfd);
close(wq->bfd.fd);
wq->bfd.fd = -1;
}
/* release the queue itself */
@ -1327,8 +1328,8 @@ void log_target_destroy(struct log_target *target)
}
wq = target->tgt_file.wqueue;
if (wq) {
osmo_fd_unregister(&wq->bfd);
if (wq->bfd.fd >= 0) {
osmo_fd_unregister(&wq->bfd);
if (target->type == LOG_TGT_TYPE_FILE)
close(wq->bfd.fd);
wq->bfd.fd = -1;
@ -1375,8 +1376,8 @@ int log_target_file_reopen(struct log_target *target)
return -errno;
} else {
wq = target->tgt_file.wqueue;
osmo_fd_unregister(&wq->bfd);
if (wq->bfd.fd >= 0) {
osmo_fd_unregister(&wq->bfd);
close(wq->bfd.fd);
wq->bfd.fd = -1;
}