8 Star 0 Fork 38

src-openEuler/rsyslog

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
克隆/下载
backport-Fix-runConf-NULL-pointer-refence.patch 1.00 KB
一键复制 编辑 原始数据 按行查看 历史
zhangqiumiao 提交于 2024-12-21 16:24 +08:00 . backport some patches from upstream
From d38e4b7bfc5bd0137914859837dcc04076b9e1ea Mon Sep 17 00:00:00 2001
From: Wang Haitao <45086632+apple-ouyang@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:50:37 +0800
Subject: [PATCH] Fix runConf NULL pointer refence
`systemd restart rsyslog` in the early start of OS will let rsyslog segmentation fault.
This cmd will send sigTerm to rsylogd, and rsyslogd will handle the signal in rsyslogdDoDie.
If the rsyslogd havn't parse the conf, the runConf will be NULL
So check the pointer before reference it.
---
tools/rsyslogd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
index ed81df3a7..1340b1e62 100644
--- a/tools/rsyslogd.c
+++ b/tools/rsyslogd.c
@@ -2013,7 +2013,7 @@ rsyslogdDoDie(int sig)
abort();
}
bFinished = sig;
- if(runConf->globals.debugOnShutdown) {
+ if(runConf && runConf->globals.debugOnShutdown) {
/* kind of hackish - set to 0, so that debug_swith will enable
* and AND emit the "start debug log" message.
*/
--
2.33.0
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/src-openeuler/rsyslog.git
git@gitee.com:src-openeuler/rsyslog.git
src-openeuler
rsyslog
rsyslog
master

搜索帮助