From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 19 Sep 2022 09:29:56 +0000 (+0200)
Subject: coredump: when parsing json, optionally copy the string first
X-Git-Tag: v252-rc1~54^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87707784c70dc9894ec613df0a6e75e732a362a3;p=thirdparty%2Fsystemd.git

coredump: when parsing json, optionally copy the string first
---

diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index 3ba06c5290e..ae4193cacfb 100644
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -326,6 +326,19 @@ static int parse_package_metadata(const char *name, JsonVariant *id_json, Elf *e
                         if (note_header.n_type != ELF_PACKAGE_METADATA_ID)
                                 continue;
 
+                        _cleanup_free_ char *payload_0suffixed = NULL;
+                        assert(note_offset > desc_offset);
+                        size_t payload_len = note_offset - desc_offset;
+
+                        /* If we are lucky and the payload is NUL-padded, we don't need to copy the string.
+                         * But if happens to go all the way until the end of the buffer, make a copy. */
+                        if (payload[payload_len-1] != '\0') {
+                                payload_0suffixed = memdup_suffix0(payload, payload_len);
+                                if (!payload_0suffixed)
+                                        return log_oom();
+                                payload = payload_0suffixed;
+                        }
+
                         r = json_parse(payload, 0, &v, NULL, NULL);
                         if (r < 0)
                                 return log_error_errno(r, "json_parse on %s failed: %m", payload);