Blame SOURCES/0309-sd-bus-make-sure-dispatch_rqueue-initializes-return-.patch
|
 |
b9a53a |
From 19a9c67b79ebb9a65bc2aec8d8f2799262ef0cb2 Mon Sep 17 00:00:00 2001
|
|
|
4b8c80 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
4b8c80 |
Date: Thu, 17 Jan 2019 18:15:37 +0100
|
|
|
4b8c80 |
Subject: [PATCH] sd-bus: make sure dispatch_rqueue() initializes return
|
|
|
4b8c80 |
parameter on all types of success
|
|
|
4b8c80 |
|
|
|
4b8c80 |
Let's make sure our own code follows coding style and initializes all
|
|
|
4b8c80 |
return values on all types of success (and leaves it uninitialized in
|
|
|
4b8c80 |
all types of failure).
|
|
|
4b8c80 |
|
|
|
4b8c80 |
(cherry picked from commit c0bc4ec5cc17ac61773d1e9362b0ffa8382c1ff1)
|
|
|
4b8c80 |
Related: CVE-2020-1712
|
|
|
4b8c80 |
---
|
|
|
4b8c80 |
src/libsystemd/sd-bus/sd-bus.c | 4 +++-
|
|
|
4b8c80 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
4b8c80 |
|
|
|
4b8c80 |
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
4b8c80 |
index 64026f7ee1..55b008cc9f 100644
|
|
|
4b8c80 |
--- a/src/libsystemd/sd-bus/sd-bus.c
|
|
|
4b8c80 |
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
4b8c80 |
@@ -1814,8 +1814,10 @@ static int dispatch_rqueue(sd_bus *bus, bool hint_priority, int64_t priority, sd
|
|
|
4b8c80 |
r = bus_read_message(bus, hint_priority, priority);
|
|
|
4b8c80 |
if (r < 0)
|
|
|
4b8c80 |
return r;
|
|
|
4b8c80 |
- if (r == 0)
|
|
|
4b8c80 |
+ if (r == 0) {
|
|
|
4b8c80 |
+ *m = NULL;
|
|
|
4b8c80 |
return ret;
|
|
|
4b8c80 |
+ }
|
|
|
4b8c80 |
|
|
|
4b8c80 |
ret = 1;
|
|
|
4b8c80 |
}
|