daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Pablo Greco 48fc63
From 0045159ffd9fb174b3da5fcccb5d2139245fe089 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Pablo Greco 48fc63
Date: Mon, 9 Jul 2018 13:21:44 +0200
Pablo Greco 48fc63
Subject: [PATCH] bus-message: do not crash on message with a string of zero
Pablo Greco 48fc63
 length
Pablo Greco 48fc63
Pablo Greco 48fc63
We'd calculate the "real" length of the string as 'item_size - 1', which does
Pablo Greco 48fc63
not work out well when item_size == 0.
Pablo Greco 48fc63
Pablo Greco 48fc63
(cherry-picked from commit 81b6e63029eefcb0ec03a3a7c248490e38106073)
Pablo Greco 48fc63
Pablo Greco 48fc63
Resolves: #1643396
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 src/libsystemd/sd-bus/bus-message.c                |   6 ++++++
Pablo Greco 48fc63
 .../crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e | Bin 0 -> 51 bytes
Pablo Greco 48fc63
 2 files changed, 6 insertions(+)
Pablo Greco 48fc63
 create mode 100644 test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
Pablo Greco 48fc63
index c8402a23a9..121e65674d 100644
Pablo Greco 48fc63
--- a/src/libsystemd/sd-bus/bus-message.c
Pablo Greco 48fc63
+++ b/src/libsystemd/sd-bus/bus-message.c
Pablo Greco 48fc63
@@ -3402,6 +3402,12 @@ _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) {
Pablo Greco 48fc63
                 if (IN_SET(type, SD_BUS_TYPE_STRING, SD_BUS_TYPE_OBJECT_PATH, SD_BUS_TYPE_SIGNATURE)) {
Pablo Greco 48fc63
                         bool ok;
Pablo Greco 48fc63
 
Pablo Greco 48fc63
+                        /* D-Bus spec: The marshalling formats for the string-like types all end
Pablo Greco 48fc63
+                         * with a single zero (NUL) byte, but that byte is not considered to be part
Pablo Greco 48fc63
+                         * of the text. */
Pablo Greco 48fc63
+                        if (c->item_size == 0)
Pablo Greco 48fc63
+                                return -EBADMSG;
Pablo Greco 48fc63
+
Pablo Greco 48fc63
                         r = message_peek_body(m, &rindex, 1, c->item_size, &q);
Pablo Greco 48fc63
                         if (r < 0)
Pablo Greco 48fc63
                                 return r;
Pablo Greco 48fc63
diff --git a/test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e b/test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e
Pablo Greco 48fc63
new file mode 100644
Pablo Greco 48fc63
index 0000000000000000000000000000000000000000..4488f0a6c685b5d43eddbe41a0c6a3b6be9b02e2
Pablo Greco 48fc63
GIT binary patch
Pablo Greco 48fc63
literal 51
Pablo Greco 48fc63
fcmc~1WMC4sJpJnr13KV`0|t%6q+%$@&=ddw)CUPg
Pablo Greco 48fc63
Pablo Greco 48fc63
literal 0
Pablo Greco 48fc63
HcmV?d00001
Pablo Greco 48fc63