|
 |
ff6046 |
From 6abfec31acae53943896b309db4a09a1cecac9a3 Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
ff6046 |
Date: Wed, 17 Oct 2018 18:37:48 +0200
|
|
|
ff6046 |
Subject: [PATCH] core: enforce a limit on STATUS= texts recvd from services
|
|
|
ff6046 |
|
|
|
ff6046 |
Let's better be safe than sorry, and put a limit on what we receive.
|
|
|
ff6046 |
|
|
|
ff6046 |
(cherry picked from commit 3eac1bcae9284fb8b18f4b82156c0e85ddb004e5)
|
|
|
ff6046 |
|
|
|
ff6046 |
Related: CVE-2018-15686
|
|
|
ff6046 |
---
|
|
|
ff6046 |
src/core/service.c | 8 ++++++--
|
|
|
ff6046 |
src/core/service.h | 2 ++
|
|
|
ff6046 |
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/src/core/service.c b/src/core/service.c
|
|
|
ff6046 |
index db1356c417..db17221888 100644
|
|
|
ff6046 |
--- a/src/core/service.c
|
|
|
ff6046 |
+++ b/src/core/service.c
|
|
|
ff6046 |
@@ -3549,8 +3549,12 @@ static void service_notify_message(
|
|
|
ff6046 |
_cleanup_free_ char *t = NULL;
|
|
|
ff6046 |
|
|
|
ff6046 |
if (!isempty(e)) {
|
|
|
ff6046 |
- if (!utf8_is_valid(e))
|
|
|
ff6046 |
- log_unit_warning(u, "Status message in notification message is not UTF-8 clean.");
|
|
|
ff6046 |
+ /* Note that this size limit check is mostly paranoia: since the datagram size we are willing
|
|
|
ff6046 |
+ * to process is already limited to NOTIFY_BUFFER_MAX, this limit here should never be hit. */
|
|
|
ff6046 |
+ if (strlen(e) > STATUS_TEXT_MAX)
|
|
|
ff6046 |
+ log_unit_warning(u, "Status message overly long (%zu > %u), ignoring.", strlen(e), STATUS_TEXT_MAX);
|
|
|
ff6046 |
+ else if (!utf8_is_valid(e))
|
|
|
ff6046 |
+ log_unit_warning(u, "Status message in notification message is not UTF-8 clean, ignoring.");
|
|
|
ff6046 |
else {
|
|
|
ff6046 |
t = strdup(e);
|
|
|
ff6046 |
if (!t)
|
|
|
ff6046 |
diff --git a/src/core/service.h b/src/core/service.h
|
|
|
ff6046 |
index 9c06e91883..a142b09f0d 100644
|
|
|
ff6046 |
--- a/src/core/service.h
|
|
|
ff6046 |
+++ b/src/core/service.h
|
|
|
ff6046 |
@@ -202,3 +202,5 @@ const char* service_result_to_string(ServiceResult i) _const_;
|
|
|
ff6046 |
ServiceResult service_result_from_string(const char *s) _pure_;
|
|
|
ff6046 |
|
|
|
ff6046 |
DEFINE_CAST(SERVICE, Service);
|
|
|
ff6046 |
+
|
|
|
ff6046 |
+#define STATUS_TEXT_MAX (16U*1024U)
|