From f67e047aa9cf27e3dd75f85bdffd87de22386fc9 Mon Sep 17 00:00:00 2001
From: Nikolay Shirokovskiy <nshirokovskiy@tarantool.org>
Date: Mon, 14 Oct 2024 17:34:34 +0300
Subject: [PATCH] say: fix NULL pointer dereference in log_syslog_init
If opts.identity is NULL and strdup is failed we do NULL pointer
dereference when reporting the error. Let's just panic if strdup() failed.
While at it replace another strdup() with xstrdup() in this function. Our
current approach is to panic on runtime OOM.
Closes tarantool/security#128
NO_TEST=issue is not possible after the fix
NO_CHANGELOG=not reproducible
NO_DOC=bugfix
(cherry picked from commit 47b72f44986797466b95b9431a381dbef7dd64fd)
---
src/lib/core/say.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/lib/core/say.c b/src/lib/core/say.c
index 2963f8595c..de8ac167b4 100644
--- a/src/lib/core/say.c
+++ b/src/lib/core/say.c
@@ -627,23 +627,12 @@ log_syslog_init(struct log *log, const char *init_str)
return -1;
log->syslog_server_type = opts.server_type;
- if (log->syslog_server_type != SAY_SYSLOG_DEFAULT) {
- log->path = strdup(opts.server_path);
- if (log->path == NULL) {
- diag_set(OutOfMemory, strlen(opts.server_path),
- "malloc", "server address");
- return -1;
- }
- }
+ if (log->syslog_server_type != SAY_SYSLOG_DEFAULT)
+ log->path = xstrdup(opts.server_path);
if (opts.identity == NULL)
- log->syslog_ident = strdup("tarantool");
+ log->syslog_ident = xstrdup("tarantool");
else
- log->syslog_ident = strdup(opts.identity);
- if (log->syslog_ident == NULL) {
- diag_set(OutOfMemory, strlen(opts.identity), "malloc",
- "log->syslog_ident");
- return -1;
- }
+ log->syslog_ident = xstrdup(opts.identity);
if (opts.facility == syslog_facility_MAX)
log->syslog_facility = SYSLOG_LOCAL7;
--
GitLab